Unifying the Lunaix's Physical Memory Model (#28)

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

diff --git a/lunaix-os/kernel.mk b/lunaix-os/kernel.mk
index c8447033ed6ac35a4db9a2ddd8d02184895dec69..9d6ca02ec5fc271e23aa4b2988e320d64108ca74 100644 (file)
--- a/lunaix-os/kernel.mk
+++ b/lunaix-os/kernel.mk
@@ -1,6 +1,8 @@
 include os.mkinc
 include toolchain.mkinc
 
 include os.mkinc
 include toolchain.mkinc
 

+kexclusion = $(shell cat ksrc.excludes)
+

 define ksrc_dirs
        kernel
        hal
 define ksrc_dirs
        kernel
        hal


@@ -19,30 +21,36 @@ kbin_dir := $(BUILD_DIR)
 kbin := $(BUILD_NAME)
 
 ksrc_files := $(foreach f, $(ksrc_dirs), $(shell find $(f) -name "*.[cS]"))
 kbin := $(BUILD_NAME)
 
 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_objs := $(addsuffix .o,$(ksrc_files))

+ksrc_deps := $(addsuffix .d,$(ksrc_files))

 
 kinc_opts := $(addprefix -I,$(kinc_dirs))
 
 
 CFLAGS += -include flags.h
 
 kinc_opts := $(addprefix -I,$(kinc_dirs))
 
 
 CFLAGS += -include flags.h

+CFLAGS += -include config.h

 
 %.S.o: %.S
        $(call status_,AS,$<)
 
 %.S.o: %.S
        $(call status_,AS,$<)

-       @$(CC) $(kinc_opts) -c $< -o $@
+       @$(CC) $(CFLAGS) $(kinc_opts) -c $< -o $@

 
 %.c.o: %.c
        $(call status_,CC,$<)
        @$(CC) $(CFLAGS) $(kinc_opts) -c $< -o $@
 
 
 %.c.o: %.c
        $(call status_,CC,$<)
        @$(CC) $(CFLAGS) $(kinc_opts) -c $< -o $@
 

-$(kbin): $(ksrc_objs) $(kbin_dir)
-       $(call status_,LD,$@)
-       @$(CC) -T link/linker.ld -o $(kbin) $(ksrc_objs) $(LDFLAGS)
-

 $(kbin_dir)/modksyms: $(kbin)
 $(kbin_dir)/modksyms: $(kbin)

-       $(call status_,GEN,$@)
+       $(call status_,MOD,$@)

        @$(PY) scripts/syms_export.py --bits=32 --order=little -o "$@"  "$<" 
 
        @$(PY) scripts/syms_export.py --bits=32 --order=little -o "$@"  "$<" 
 

-all: $(kbin) $(kbin_dir)/modksyms
+.PHONY: __do_relink
+__do_relink: $(ksrc_objs)
+       $(call status_,LD,$(kbin))
+       @$(CC) -T link/linker.ld -o $(kbin) $(ksrc_objs) $(LDFLAGS)
+
+.PHONY: all
+all: __do_relink $(kbin_dir)/modksyms

 
 clean:
 
 clean:

-       @rm -f $(ksrc_objs)
\ No newline at end of file
+       @rm -f $(ksrc_objs)
+       @rm -f $(ksrc_deps)
\ No newline at end of file