fix dependency check logic cause config always disabled

[lunaix-os.git] / lunaix-os / usr / makefile

diff --git a/lunaix-os/usr/makefile b/lunaix-os/usr/makefile
index 49036fc5629967a2832284f464d8d4ec58912336..8fa1c316e75ba6d076e9e4ab4546f594849d4322 100644 (file)
--- a/lunaix-os/usr/makefile
+++ b/lunaix-os/usr/makefile
@@ -1,8 +1,6 @@
 include utils.mkinc
 include toolchain.mkinc
 
 include utils.mkinc
 include toolchain.mkinc
 

-LCONFIG_FLAGS := --quiet
-

 include lunabuild.mkinc
 
 include $(lbuild_mkinc)
 include lunabuild.mkinc
 
 include $(lbuild_mkinc)


@@ -11,6 +9,9 @@ ifndef ARCH
 $(error ARCH is not set)
 endif
 
 $(error ARCH is not set)
 endif
 

+CFLAGS += $(BUILD_CFLAGS)
+LDFLAGS += $(BUILD_LDFLAGS)
+

 task := all
 
 sys_include := $(CURDIR)/includes
 task := all
 
 sys_include := $(CURDIR)/includes


@@ -29,7 +30,7 @@ BUILD_NAME := $(libc_name).a
 LIBC_INCLUDE := $(build_dir)/usr/includes
 
 mkapp-list := $(addprefix app-, $(shell cat apps.list))
 LIBC_INCLUDE := $(build_dir)/usr/includes
 
 mkapp-list := $(addprefix app-, $(shell cat apps.list))

-mkexec-list := $(addprefix $(build_dir)/bin/, $(_LBUILD_SRCS))
+mkexec-list := $(addprefix $(build_dir)/bin/, $(BUILD_SRCS))

 
 uexec_ld := $(CURDIR)/uexec.ld
 
 
 uexec_ld := $(CURDIR)/uexec.ld
 


@@ -51,7 +52,7 @@ $(build_dir)/$(libc_name).a: $(build_dir)/bin \
        @$(MAKE) $(MKFLAGS) -C libc/ $(task)
 
 $(uexec_ld): $(uexec_ld)x
        @$(MAKE) $(MKFLAGS) -C libc/ $(task)
 
 $(uexec_ld): $(uexec_ld)x

-       @$(CC) -include $(lbuild_config_h) -x c -P -E $< -o $@
+       @$(CC) $(CFLAGS) -x c -P -E $< -o $@

 
 # Application (with standalone makefile)
 export LD_SCRIPT := $(uexec_ld)
 
 # Application (with standalone makefile)
 export LD_SCRIPT := $(uexec_ld)