summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile21
1 files changed, 11 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index a584ec9..33af30f 100644
--- a/Makefile
+++ b/Makefile
@@ -16,22 +16,28 @@ SFILES += $(foreach dir, $(CDIRS), $(wildcard arch/$(TARGET_MACHINE)/$(dir)/*.s)
OBJFILES := $(patsubst %.c,%.o,$(CFILES))
OBJFILES += $(patsubst %.s,%.o,$(SFILES))
+OBJFILES += uacpi.a
DEPFILES := $(patsubst %.c,%.d,$(CFILES))
-CLEAN_DEPENDS =
+CLEAN_DEPENDS =
BIN := jove.elf
INCDIR := $(OUT)/usr/include/kernel
all: $(BIN)
-
headers:
mkdir -p $(INCDIR)
- -$(foreach dir,$(CDIRS),$$(mkdir -p $(INCDIR)/$(dir) $(INCDIR)/arch/$(dir)/))
+ -$(foreach dir,$(CDIRS),mkdir -p $(INCDIR)/$(dir) $(INCDIR)/arch/$(dir)/;)
-cp *.h $(INCDIR)/
- -$(foreach dir,$(CDIRS),$$(cp $(dir)/*.h $(INCDIR)/$(dir)/))
- -$(foreach dir,$(CDIRS),$$(cp arch/$(TARGET_MACHINE)/$(dir)/*.h $(INCDIR)/arch/$(dir)/))
+ -$(foreach dir,$(CDIRS),cp $(dir)/*.h $(INCDIR)/$(dir)/;)
+ -$(foreach dir,$(CDIRS),cp arch/$(TARGET_MACHINE)/$(dir)/*.h $(INCDIR)/arch/$(dir)/;)
+
+$(BIN): ${OBJFILES}
+ $(LD) $(LDFLAGS) ${OBJFILES} -o $(BIN)
+
+include uacpi.mk
+-include ${DEPFILES}
.PHONY: clean
clean: $(CLEAN_DEPENDS)
@@ -39,11 +45,6 @@ clean: $(CLEAN_DEPENDS)
-rm $(DEPFILES)
-rm $(BIN)
-$(BIN): ${OBJFILES}
- $(LD) $(LDFLAGS) ${OBJFILES} -o $(BIN)
-
--include ${DEPFILES}
-
%.o:%.c
$(CC) $(CFLAGS) -c $< -o $@