diff options
| author | Marvin Borner | 2021-05-20 20:19:05 +0200 |
|---|---|---|
| committer | Marvin Borner | 2021-05-20 20:19:05 +0200 |
| commit | 519a1de7d9fe809efc4077933fabbe93a8da9439 (patch) | |
| tree | be9d636e48036b42c8c6cc490b5f53db8b4f3a2e /apps/wm | |
| parent | 59de0af0cff96182d3e30ab453bc9763a6635947 (diff) | |
More generic makefile layout
Diffstat (limited to 'apps/wm')
| -rw-r--r-- | apps/wm/Makefile | 17 | ||||
| -rw-r--r-- | apps/wm/main.c (renamed from apps/wm/wm.c) | 2 |
2 files changed, 5 insertions, 14 deletions
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 }; |