From fbed1e4bcdd290e057e6cbf88ad413df1a67d129 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Fri, 28 Aug 2015 15:42:03 -0400 Subject: [PATCH] Kbuild: Use DOTCONFIG instead of /.config Change-Id: Ida72f1321f6b02c5d506e4c9a9a18035e9c13b0d Signed-off-by: Anas Nashif --- Makefile.inc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index c461817ef1b..4e040729708 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -53,14 +53,19 @@ endif zephyrmake = @$(MAKE) -C $(ZEPHYR_BASE) O=$(1) CFLAGS="$(CFLAGS)" \ PROJECT=$(PROJECT_BASE) SOURCE_DIR=$(SOURCE_DIR) $(2) -all: $(O)/.config +DOTCONFIG = $(O)/.config + +all: $(DOTCONFIG) $(Q)$(call zephyrmake,$(O),$@) -qemu: $(O)/.config +qemu: $(DOTCONFIG) $(Q)$(call zephyrmake,$(O),$@) +# Catch all +%: + $(Q)$(call zephyrmake,$(O),$@) -$(O)/.config: $(CONF_FILE) +$(DOTCONFIG): $(CONF_FILE) $(Q)$(CONFIG_SHELL) $(ZEPHYR_BASE)/scripts/kconfig/merge_config.sh \ -q -m -O $(O) $(KBUILD_DEFCONFIG_PATH) $< $(Q)yes "" | $(MAKE) $(S) -C $(ZEPHYR_BASE) O=$(O) \ @@ -72,9 +77,5 @@ pristine: PHONY += FORCE FORCE: -# Catch all -%: - $(Q)$(call zephyrmake,$(O),$@) .PHONY: $(PHONY) -.PRECIOUS: %/.dir