X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/f09e806d5032150564df39a2f7b1192c4d84cf15..32b9a6d76790c73d3d2d36d9081a2581cc65d184:/lunaix-os/kernel.mk

diff --git a/lunaix-os/kernel.mk b/lunaix-os/kernel.mk
index 81e8921..86f4668 100644
--- a/lunaix-os/kernel.mk
+++ b/lunaix-os/kernel.mk
@@ -1,44 +1,51 @@
 include os.mkinc
 include toolchain.mkinc
 
-define ksrc_dirs
-	kernel
-	hal
-	debug
-	libs
-	arch/$(ARCH)
-endef
-
-define kinc_dirs
-	includes
-	includes/usr
-endef
-
+include .builder/lbuild.mkinc
 
 kbin_dir := $(BUILD_DIR)
 kbin := $(BUILD_NAME)
 
-ksrc_files := $(foreach f, $(ksrc_dirs), $(shell find $(f) -name "*.[cS]"))
-ksrc_objs := $(addsuffix .o,$(ksrc_files))
+ksrc_objs := $(addsuffix .o,$(_LBUILD_SRCS))
+ksrc_deps := $(addsuffix .d,$(_LBUILD_SRCS))
+khdr_opts := $(addprefix -include ,$(_LBUILD_HDRS))
+kinc_opts := $(addprefix -I,$(_LBUILD_INCS))
+config_h += -include.builder/configs.h
 
-kinc_opts := $(addprefix -I,$(kinc_dirs))
+tmp_kbin  := $(BUILD_DIR)/tmpk.bin
+ksymtable := lunaix_ksyms.o
 
+CFLAGS += $(khdr_opts) $(kinc_opts) $(config_h) -MMD -MP
 
-CFLAGS += -include flags.h
+-include $(ksrc_deps)
 
-%.S.o: %.S
+%.S.o: %.S kernel.mk
 	$(call status_,AS,$<)
-	@$(CC) $(kinc_opts) -c $< -o $@
+	@$(CC) $(CFLAGS) -c $< -o $@
 
-%.c.o: %.c
+%.c.o: %.c kernel.mk
 	$(call status_,CC,$<)
-	@$(CC) $(CFLAGS) $(kinc_opts) -c $< -o $@
+	@$(CC) $(CFLAGS) -c $< -o $@
 
-$(kbin): $(ksrc_objs) $(kbin_dir)
+$(tmp_kbin): $(ksrc_objs)
 	$(call status_,LD,$@)
-	@$(CC) -T link/linker.ld -o $(kbin) $(ksrc_objs) $(LDFLAGS)
+	@$(CC) -T link/linker.ld $(config_h) $(LDFLAGS) -o $@ $^
+
+$(ksymtable): $(tmp_kbin)
+	$(call status_,KSYM,$@)
+	@scripts/gen_ksymtable.sh DdRrTtAGg $< > .lunaix_ksymtable.S
+	@$(CC) $(CFLAGS) -c .lunaix_ksymtable.S -o $@
+
+.PHONY: __do_relink
+__do_relink: $(ksrc_objs) $(ksymtable)
+	$(call status_,LD,$(kbin))
+	@$(CC) -T link/linker.ld $(config_h) $(LDFLAGS) -o $(kbin) $^
+	@rm $(tmp_kbin)
 
-all: $(kbin)
+.PHONY: all
+all: __do_relink
 
 clean:
-	@rm -f $(ksrc_objs)
\ No newline at end of file
+	@rm -f $(ksrc_objs)
+	@rm -f $(ksrc_deps)
+	@rm -f .lunaix_ksymtable.S $(ksymtable)
\ No newline at end of file