aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraqua <aqua@iserlohn-fortress.net>2023-03-12 19:54:40 +0200
committeraqua <aqua@iserlohn-fortress.net>2023-03-12 19:54:40 +0200
commit50cba946de2b66f32b3386d6127b1ab850583d0d (patch)
tree070737868f46590f203dc7ead8625ec7b062a419
parentRevert VGA C driver (diff)
downloadkernel-50cba946de2b66f32b3386d6127b1ab850583d0d.tar.xz
src/Makefile: generate conf.h if it doesn't exist
-rw-r--r--rules.mk5
-rw-r--r--src/Makefile2
2 files changed, 4 insertions, 3 deletions
diff --git a/rules.mk b/rules.mk
index e217d6d..75fa9f1 100644
--- a/rules.mk
+++ b/rules.mk
@@ -11,7 +11,7 @@ objects = $(foreach f,$($1),$(addsuffix $2.o,$(basename $f)))
depends = $(foreach f,$(filter %.S %.c %.cpp,$($1)),$(addsuffix $2.d,$(basename $f)))
# default target
-all: targets
+.DEFAULT_GOAL := all
# TARGETBIN: binaries using the target architecture
@@ -55,11 +55,12 @@ debug:
%.info:
@echo "Target: $(basename $@)"
+ @echo " ARCH: ${ARCH}"
@echo " SRCS: ${$(basename $@).SRCS}"
@echo " OBJS: ${$(basename $@).OBJS}"
@echo " DEPS: ${$(basename $@).DEPS}"
-targets: ${DEFAULT_TARGETS}
+all: ${DEFAULT_TARGETS}
@echo " -> Built ${DEFAULT_TARGETS}"
# extra flags
diff --git a/src/Makefile b/src/Makefile
index 3a5d41b..9f98d92 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,13 +6,13 @@ ${ARCH}_CXXFLAGS += ${INCLUDES}
TARGETLIB += kernel
kernel.SRCS := multiboot2.c mmap.c kernel.cpp mem/vmm.c
-kernel.OBJS := conf.h
TESTS += \
sched/test_taskqueue sched/test_roundrobin
include ../rules.mk
+kernel.c: conf.h
conf.h: conf.h.in
@echo ' GEN $@'
@cp conf.h.in conf.h