updated readme, fix configuration shell invoked twice.

[lunaix-os.git] / lunaix-os / kernel.mk

diff --git a/lunaix-os/kernel.mk b/lunaix-os/kernel.mk
index eb5276d779f6ee2b6bd6b0d95666ed480c8c2b72..a0a24040ebf40e82d0449d077d19f97d44928528 100644 (file)
--- a/lunaix-os/kernel.mk
+++ b/lunaix-os/kernel.mk
@@ -1,58 +1,56 @@
-include toolchain.mkinc
-include lunabuild.mkinc
-
-include $(lbuild_mkinc)
+include kbuild_deps.mkinc

 
 kbin_dir := $(BUILD_DIR)
 kbin := $(BUILD_NAME)
 
 
 kbin_dir := $(BUILD_DIR)
 kbin := $(BUILD_NAME)
 

-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 $(lbuild_config_h)
-

 tmp_kbin  := $(BUILD_DIR)/tmpk.bin
 tmp_kbin  := $(BUILD_DIR)/tmpk.bin

-ksymtable := lunaix_ksyms.o

 klinking  := link/lunaix.ld
 
 klinking  := link/lunaix.ld
 

-CFLAGS += $(khdr_opts) $(kinc_opts) $(config_h) -MMD -MP
-
--include $(ksrc_deps)
+CFLAGS += $(kcflags) -MMD -MP

 
 all_linkable = $(filter-out $(klinking),$(1))
 
 %.S.o: %.S $(khdr_files) kernel.mk
 
 all_linkable = $(filter-out $(klinking),$(1))
 
 %.S.o: %.S $(khdr_files) kernel.mk

-       $(call status_,AS,$<)
+       $(call status,AS,$<)

        @$(CC) $(CFLAGS) -c $< -o $@
 
 %.c.o: %.c kernel.mk
        @$(CC) $(CFLAGS) -c $< -o $@
 
 %.c.o: %.c kernel.mk

-       $(call status_,CC,$<)
+       $(call status,CC,$<)

        @$(CC) $(CFLAGS) -c $< -o $@
 
 
 $(klinking): link/lunaix.ldx
        @$(CC) $(CFLAGS) -c $< -o $@
 
 
 $(klinking): link/lunaix.ldx

-       $(call status_,PP,$<)
+       $(call status,PP,$<)

        @$(CC) $(CFLAGS) -x c -E -P $< -o $@
 
 
 $(tmp_kbin): $(klinking) $(ksrc_objs)
        @$(CC) $(CFLAGS) -x c -E -P $< -o $@
 
 
 $(tmp_kbin): $(klinking) $(ksrc_objs)

-       $(call status_,LD,$@)
+       $(call status,LD,$@)

 
        @$(CC) -T $(klinking) $(config_h) $(LDFLAGS) -o $@ \
                        $(call all_linkable,$^)
 
 
        @$(CC) -T $(klinking) $(config_h) $(LDFLAGS) -o $@ \
                        $(call all_linkable,$^)
 

+ksymtable := lunaix_ksyms.o
+ksecsmap  := lunaix_ksecsmap.o
+
+kautogen  := $(ksecsmap) $(ksymtable)

 
 $(ksymtable): $(tmp_kbin)
 
 $(ksymtable): $(tmp_kbin)

-       $(call status_,KSYM,$@)
-       @ARCH=$(ARCH) scripts/gen_ksymtable.sh DdRrTtAGg $< > lunaix_ksymtable.S
+       $(call status,KSYM,$@)
+       @ARCH=$(ARCH) scripts/gen-ksymtable DdRrTtAGg $< > lunaix_ksymtable.S

 
        @$(CC) $(CFLAGS) -c lunaix_ksymtable.S -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
 
 .PHONY: __do_relink

-__do_relink: $(klinking) $(ksrc_objs) $(ksymtable)
-       $(call status_,LD,$(kbin))
+
+__do_relink: $(klinking) $(ksrc_objs) $(kautogen)
+       $(call status,LD,$(kbin))

 
        @$(CC) -T $(klinking) $(config_h) $(LDFLAGS) -o $(kbin) \
                        $(call all_linkable,$^)
 
        @$(CC) -T $(klinking) $(config_h) $(LDFLAGS) -o $(kbin) \
                        $(call all_linkable,$^)