git://scm.lunaixsky.com
/
lunaix-os.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into isa/arm64
[lunaix-os.git]
/
lunaix-os
/
makeinc
/
lunabuild.mkinc
diff --git
a/lunaix-os/makeinc/lunabuild.mkinc
b/lunaix-os/makeinc/lunabuild.mkinc
index d246a6e9c209db014fcfc44b7ebe63147c9789bb..aee8e495a70f776a876caf1b2acaa67e90e00433 100644
(file)
--- a/
lunaix-os/makeinc/lunabuild.mkinc
+++ b/
lunaix-os/makeinc/lunabuild.mkinc
@@
-7,15
+7,16
@@
lbuild_opts := --lconfig-file LConfig
all_lconfigs = $(shell find $(CURDIR) -name "LConfig")
all_lconfigs = $(shell find $(CURDIR) -name "LConfig")
+LCONFIG_FLAGS += --config $(lbuild_opts) --config-save $(lconfig_save)
+
export
$(lconfig_save): $(all_lconfigs)
@echo restarting configuration...
export
$(lconfig_save): $(all_lconfigs)
@echo restarting configuration...
- @$(LBUILD) --config $(lbuild_opts) --config-save $(lconfig_save) --force\
- -o $(lbuild_dir)/
+ @$(LBUILD) $(LCONFIG_FLAGS) --force -o $(lbuild_dir)/
export
$(lbuild_config_h): $(lconfig_save)
export
$(lbuild_config_h): $(lconfig_save)
- @$(LBUILD)
--config $(lbuild_opts) --config-save $(lconfig_save
) -o $(@D)
+ @$(LBUILD)
$(LCONFIG_FLAGS
) -o $(@D)
export
$(lbuild_mkinc): $(lbuild_config_h)
export
$(lbuild_mkinc): $(lbuild_config_h)
@@
-24,5
+25,5
@@
$(lbuild_mkinc): $(lbuild_config_h)
.PHONY: config
export
config: $(all_lconfigs)
.PHONY: config
export
config: $(all_lconfigs)
- @$(LBUILD)
--config $(lbuild_opts) --config-save $(lconfig_save
) --force\
+ @$(LBUILD)
$(LCONFIG_FLAGS
) --force\
-o $(lbuild_dir)/
-o $(lbuild_dir)/