More generic makefile layout

11 files changed, 38 insertions, 66 deletions

diff --git a/apps/chess/Makefile b/apps/chess/Makefile
index e84f65f..bc65e93 100644
--- a/apps/chess/Makefile
+++ b/apps/chess/Makefile
@@ -1,16 +1,7 @@
 # MIT License, Copyright (c) 2021 Marvin Borner
 
-OBJS = chess.o
+NAME = chess
+OBJS = main.o
+LIBS = -lgui -lc
 
-all: $(OBJS)
-	@mkdir -p $(BUILD)/apps/chess/
-	@$(LD) -o $(BUILD)/apps/chess/exec $(LDFLAGS) $^ -lgui -ltxt -lc
-ifeq ($(CONFIG_STRIP), true)
-	@$(ST) --strip-all $(BUILD)/apps/chess/exec
-endif
-
-clean:
-	@$(RM) -f $(OBJS)
-
-%.o: %.c
-	@$(CC) -c $(CFLAGS) $< -o $@
+include ../generic.mk
diff --git a/apps/chess/chess.c b/apps/chess/main.c
index 94739ef..94739ef 100644
--- a/apps/chess/chess.c
+++ b/apps/chess/main.c
diff --git a/apps/generic.mk b/apps/generic.mk
new file mode 100644
index 0000000..f2bc936
--- /dev/null
+++ b/apps/generic.mk
@@ -0,0 +1,17 @@
+# MIT License, Copyright (c) 2021 Marvin Borner
+
+NAME ?= unknown
+LIBS ?= -lc
+
+all: $(OBJS)
+	@mkdir -p $(BUILD)/apps/$(NAME)/
+	@$(LD) -o $(BUILD)/apps/$(NAME)/exec $(LDFLAGS) $^ $(LIBS)
+ifeq ($(CONFIG_STRIP), true)
+	@$(ST) --strip-all $(BUILD)/apps/wm/exec
+endif
+
+clean:
+	@$(RM) -f $(OBJS)
+
+%.o: %.c
+	@$(CC) -c $(CFLAGS) $< -o $@
diff --git a/apps/idle/Makefile b/apps/idle/Makefile
index f4f9730..0e65edd 100644
--- a/apps/idle/Makefile
+++ b/apps/idle/Makefile
@@ -1,16 +1,7 @@
 # MIT License, Copyright (c) 2021 Marvin Borner
 
-OBJS = idle.o
+NAME = idle
+OBJS = main.o
+LIBS = -lc
 
-all: $(OBJS)
-	@mkdir -p $(BUILD)/apps/idle/
-	@$(LD) -o $(BUILD)/apps/idle/exec $(LDFLAGS) $^ -lc
-ifeq ($(CONFIG_STRIP), true)
-	@$(ST) --strip-all $(BUILD)/apps/idle/exec
-endif
-
-clean:
-	@$(RM) -f $(OBJS)
-
-%.o: %.c
-	@$(CC) -c $(CFLAGS) $< -o $@
+include ../generic.mk
diff --git a/apps/idle/idle.c b/apps/idle/main.c
index 43186ff..43186ff 100644
--- a/apps/idle/idle.c
+++ b/apps/idle/main.c
diff --git a/apps/init/Makefile b/apps/init/Makefile
index 68038d0..aa0ac8b 100644
--- a/apps/init/Makefile
+++ b/apps/init/Makefile
@@ -1,16 +1,7 @@
 # MIT License, Copyright (c) 2021 Marvin Borner
 
-OBJS = init.o
+NAME = init
+OBJS = main.o
+LIBS = -lc
 
-all: $(OBJS)
-	@mkdir -p $(BUILD)/apps/init/
-	@$(LD) -o $(BUILD)/apps/init/exec $(LDFLAGS) $^ -lc
-ifeq ($(CONFIG_STRIP), true)
-	@$(ST) --strip-all $(BUILD)/apps/init/exec
-endif
-
-clean:
-	@$(RM) -f $(OBJS)
-
-%.o: %.c
-	@$(CC) -c $(CFLAGS) $< -o $@
+include ../generic.mk
diff --git a/apps/init/init.c b/apps/init/main.c
index 44cf461..44cf461 100644
--- a/apps/init/init.c
+++ b/apps/init/main.c
diff --git a/apps/test/Makefile b/apps/test/Makefile
index e80b54b..b0e05f3 100644
--- a/apps/test/Makefile
+++ b/apps/test/Makefile
@@ -1,16 +1,7 @@
 # MIT License, Copyright (c) 2021 Marvin Borner
 
-OBJS = test.o fuzz.o
+NAME = test
+OBJS = main.o fuzz.o
+LIBS = -lc
 
-all: $(OBJS)
-	@mkdir -p $(BUILD)/apps/test/
-	@$(LD) -o $(BUILD)/apps/test/exec $(LDFLAGS) $^ -lc
-ifeq ($(CONFIG_STRIP), true)
-	@$(ST) --strip-all $(BUILD)/apps/test/exec
-endif
-
-clean:
-	@$(RM) -f $(OBJS)
-
-%.o: %.c
-	@$(CC) -c $(CFLAGS) $< -o $@
+include ../generic.mk
diff --git a/apps/test/test.c b/apps/test/main.c
index 2101412..2101412 100644
--- a/apps/test/test.c
+++ b/apps/test/main.c
diff --git a/apps/wm/Makefile b/apps/wm/Makefile
index 8fb0096..556d526 100644
--- a/apps/wm/Makefile
+++ b/apps/wm/Makefile
@@ -1,16 +1,7 @@
 # MIT License, Copyright (c) 2021 Marvin Borner
 
-OBJS = wm.o
+NAME = wm
+OBJS = main.o
+LIBS = -lgui -ltxt -lc
 
-all: $(OBJS)
-	@mkdir -p $(BUILD)/apps/wm/
-	@$(LD) -o $(BUILD)/apps/wm/exec $(LDFLAGS) $^ -lgui -ltxt -lc
-ifeq ($(CONFIG_STRIP), true)
-	@$(ST) --strip-all $(BUILD)/apps/wm/exec
-endif
-
-clean:
-	@$(RM) -f $(OBJS)
-
-%.o: %.c
-	@$(CC) -c $(CFLAGS) $< -o $@
+include ../generic.mk
diff --git a/apps/wm/wm.c b/apps/wm/main.c
index 6aed58e..83dc20b 100644
--- a/apps/wm/wm.c
+++ b/apps/wm/main.c
@@ -591,7 +591,7 @@ int main(int argc, char **argv)
 
 	assert(io_control(IO_BUS, IOCTL_BUS_REGISTER, "wm") == EOK);
 
-	/* assert(exec("chess", NULL) == EOK); */
+	assert(exec("chess", NULL) == EOK);
 
 	u8 msg[1024] = { 0 };
 	struct event_keyboard event_keyboard = { 0 };