X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/c166bd62fbb907f95f79f621e2a2fb4fdde08e01..refs/heads/master:/lunaix-os/kernel.mk

diff --git a/lunaix-os/kernel.mk b/lunaix-os/kernel.mk
index 9d6ca02..a0a2404 100644
--- a/lunaix-os/kernel.mk
+++ b/lunaix-os/kernel.mk
@@ -1,56 +1,69 @@
-include os.mkinc
-include toolchain.mkinc
+include kbuild_deps.mkinc
 
-kexclusion = $(shell cat ksrc.excludes)
+kbin_dir := $(BUILD_DIR)
+kbin := $(BUILD_NAME)
 
-define ksrc_dirs
-	kernel
-	hal
-	libs
-	arch/$(ARCH)
-endef
+tmp_kbin  := $(BUILD_DIR)/tmpk.bin
+klinking  := link/lunaix.ld
 
-define kinc_dirs
-	includes
-	includes/usr
-	arch/$(ARCH)/includes
-endef
+CFLAGS += $(kcflags) -MMD -MP
 
+all_linkable = $(filter-out $(klinking),$(1))
 
-kbin_dir := $(BUILD_DIR)
-kbin := $(BUILD_NAME)
+%.S.o: %.S $(khdr_files) kernel.mk
+	$(call status,AS,$<)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+%.c.o: %.c kernel.mk
+	$(call status,CC,$<)
+	@$(CC) $(CFLAGS) -c $< -o $@
+
+
+$(klinking): link/lunaix.ldx
+	$(call status,PP,$<)
+	@$(CC) $(CFLAGS) -x c -E -P $< -o $@
 
-ksrc_files := $(foreach f, $(ksrc_dirs), $(shell find $(f) -name "*.[cS]"))
-ksrc_files := $(filter-out $(kexclusion),$(ksrc_files))
-ksrc_objs := $(addsuffix .o,$(ksrc_files))
-ksrc_deps := $(addsuffix .d,$(ksrc_files))
 
-kinc_opts := $(addprefix -I,$(kinc_dirs))
+$(tmp_kbin): $(klinking) $(ksrc_objs)
+	$(call status,LD,$@)
 
+	@$(CC) -T $(klinking) $(config_h) $(LDFLAGS) -o $@ \
+			$(call all_linkable,$^)
 
-CFLAGS += -include flags.h
-CFLAGS += -include config.h
+ksymtable := lunaix_ksyms.o
+ksecsmap  := lunaix_ksecsmap.o
 
-%.S.o: %.S
-	$(call status_,AS,$<)
-	@$(CC) $(CFLAGS) $(kinc_opts) -c $< -o $@
+kautogen  := $(ksecsmap) $(ksymtable)
 
-%.c.o: %.c
-	$(call status_,CC,$<)
-	@$(CC) $(CFLAGS) $(kinc_opts) -c $< -o $@
+$(ksymtable): $(tmp_kbin)
+	$(call status,KSYM,$@)
+	@ARCH=$(ARCH) scripts/gen-ksymtable DdRrTtAGg $< > lunaix_ksymtable.S
 
-$(kbin_dir)/modksyms: $(kbin)
-	$(call status_,MOD,$@)
-	@$(PY) scripts/syms_export.py --bits=32 --order=little -o "$@"  "$<" 
+	@$(CC) $(CFLAGS) -c lunaix_ksymtable.S -o $@
+
+$(ksecsmap): $(tmp_kbin)
+	$(call status,KGEN,$@)
+	@scripts/elftool.tool -p -i $< > lunaix_ksecsmap.S
+
+	@$(CC) $(CFLAGS) -c lunaix_ksecsmap.S -o $@
 
 .PHONY: __do_relink
-__do_relink: $(ksrc_objs)
-	$(call status_,LD,$(kbin))
-	@$(CC) -T link/linker.ld -o $(kbin) $(ksrc_objs) $(LDFLAGS)
+
+__do_relink: $(klinking) $(ksrc_objs) $(kautogen)
+	$(call status,LD,$(kbin))
+
+	@$(CC) -T $(klinking) $(config_h) $(LDFLAGS) -o $(kbin) \
+			$(call all_linkable,$^)
+	
+	@rm $(tmp_kbin)
+
 
 .PHONY: all
-all: __do_relink $(kbin_dir)/modksyms
+all: __do_relink
+
 
 clean:
 	@rm -f $(ksrc_objs)
-	@rm -f $(ksrc_deps)
\ No newline at end of file
+	@rm -f $(ksrc_deps)
+	@rm -f $(klinking)
+	@rm -f lunaix_ksymtable.S $(ksymtable)
\ No newline at end of file