X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/32b9a6d76790c73d3d2d36d9081a2581cc65d184..28c176b668c841a3b7fb093faccf0efa39257603:/lunaix-os/kernel.mk?ds=inline

diff --git a/lunaix-os/kernel.mk b/lunaix-os/kernel.mk
index 86f4668..69a16db 100644
--- a/lunaix-os/kernel.mk
+++ b/lunaix-os/kernel.mk
@@ -1,7 +1,7 @@
-include os.mkinc
 include toolchain.mkinc
+include lunabuild.mkinc
 
-include .builder/lbuild.mkinc
+include $(lbuild_mkinc)
 
 kbin_dir := $(BUILD_DIR)
 kbin := $(BUILD_NAME)
@@ -10,16 +10,19 @@ 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
+config_h += -include $(lbuild_config_h)
 
 tmp_kbin  := $(BUILD_DIR)/tmpk.bin
 ksymtable := lunaix_ksyms.o
+klinking  := link/lunaix.ld
 
 CFLAGS += $(khdr_opts) $(kinc_opts) $(config_h) -MMD -MP
 
 -include $(ksrc_deps)
 
-%.S.o: %.S kernel.mk
+all_linkable = $(filter-out $(klinking),$(1))
+
+%.S.o: %.S $(khdr_files) kernel.mk
 	$(call status_,AS,$<)
 	@$(CC) $(CFLAGS) -c $< -o $@
 
@@ -27,25 +30,42 @@ CFLAGS += $(khdr_opts) $(kinc_opts) $(config_h) -MMD -MP
 	$(call status_,CC,$<)
 	@$(CC) $(CFLAGS) -c $< -o $@
 
-$(tmp_kbin): $(ksrc_objs)
+
+$(klinking): link/lunaix.ldx
+	$(call status_,PP,$<)
+	@$(CC) $(CFLAGS) -x c -E -P $< -o $@
+
+
+$(tmp_kbin): $(klinking) $(ksrc_objs)
 	$(call status_,LD,$@)
-	@$(CC) -T link/linker.ld $(config_h) $(LDFLAGS) -o $@ $^
+
+	@$(CC) -T $(klinking) $(config_h) $(LDFLAGS) -o $@ \
+			$(call all_linkable,$^)
+
 
 $(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)
+__do_relink: $(klinking) $(ksrc_objs) $(ksymtable)
 	$(call status_,LD,$(kbin))
-	@$(CC) -T link/linker.ld $(config_h) $(LDFLAGS) -o $(kbin) $^
+
+	@$(CC) -T $(klinking) $(config_h) $(LDFLAGS) -o $(kbin) \
+			$(call all_linkable,$^)
+	
 	@rm $(tmp_kbin)
 
+
 .PHONY: all
 all: __do_relink
 
+
 clean:
 	@rm -f $(ksrc_objs)
 	@rm -f $(ksrc_deps)
+	@rm -f $(klinking)
 	@rm -f .lunaix_ksymtable.S $(ksymtable)
\ No newline at end of file