From patchwork Sun Nov 22 14:07:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: Makefile: Add missing rule for config-devices.mak Date: Sun, 22 Nov 2009 04:07:22 -0000 From: Stefan Weil X-Patchwork-Id: 38996 Message-Id: <1258898842-5222-1-git-send-email-weil@mail.berlios.de> To: QEMU Developers Cc: All files config-devices.mak are copies from files in directory default-configs. Creating these copies during configuration ignores these dependencies and may result in unresolved externals from incremental builds when files in default-configs are modified. By adding a dependency rule to Makefile and executing the copy commands there it is possible to run incremental builds even with modified default-configs. This is especially useful for git bisect. Signed-off-by: Stefan Weil --- Makefile | 3 +++ configure | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d770e2a..fdb47fb 100644 --- a/Makefile +++ b/Makefile @@ -41,6 +41,9 @@ SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS)) config-all-devices.mak: $(SUBDIR_DEVICES_MAK) $(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep "=y$$" | sort -u > $@," GEN $@") +%/config-devices.mak: default-configs/%.mak + $(call quiet-command,cp -p $< $@, " GEN $@") + -include config-all-devices.mak build-all: $(DOCS) $(TOOLS) recurse-all diff --git a/configure b/configure index b65c11c..1223fc8 100755 --- a/configure +++ b/configure @@ -2209,10 +2209,6 @@ if test "$target" = "arm-linux-user" -o "$target" = "armeb-linux-user" -o "$targ mkdir -p $target_dir/nwfpe fi -if test ! -f $target_dir/config-devices.mak ; then - cp $source_path/default-configs/${target}.mak $target_dir/config-devices.mak -fi - # # don't use ln -sf as not all "ln -sf" over write the file/link #