From patchwork Sun Nov 22 14:07:22 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Weil X-Patchwork-Id: 38996 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1C4DBB6EEA for ; Mon, 23 Nov 2009 01:08:22 +1100 (EST) Received: from localhost ([127.0.0.1]:41509 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCD6m-0006ua-LS for incoming@patchwork.ozlabs.org; Sun, 22 Nov 2009 09:08:08 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCD6D-0006rr-99 for qemu-devel@nongnu.org; Sun, 22 Nov 2009 09:07:33 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCD68-0006oS-Ch for qemu-devel@nongnu.org; Sun, 22 Nov 2009 09:07:32 -0500 Received: from [199.232.76.173] (port=43195 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCD68-0006oN-3C for qemu-devel@nongnu.org; Sun, 22 Nov 2009 09:07:28 -0500 Received: from moutng.kundenserver.de ([212.227.17.10]:59736) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NCD66-0001Qr-Jz for qemu-devel@nongnu.org; Sun, 22 Nov 2009 09:07:27 -0500 Received: from flocke.weilnetz.de (p54ADF75B.dip.t-dialin.net [84.173.247.91]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0MbrKo-1NVO8r3NSw-00Iida; Sun, 22 Nov 2009 15:07:24 +0100 Received: from stefan by flocke.weilnetz.de with local (Exim 4.69) (envelope-from ) id 1NCD62-0001Mf-OA; Sun, 22 Nov 2009 15:07:22 +0100 From: Stefan Weil To: QEMU Developers Date: Sun, 22 Nov 2009 15:07:22 +0100 Message-Id: <1258898842-5222-1-git-send-email-weil@mail.berlios.de> X-Mailer: git-send-email 1.5.6.5 X-Provags-ID: V01U2FsdGVkX1+ldNrGEaNmdmTTEq+/7ZLDZrmdrTi1Qbr/EFc VasWw3wxkZnIY9A3g6KsYThiY8K4afy28kzjnGTLPLGfZMKW5L NneENvo/Z4arSHAe/3yv3Bq/VtIPIIjbxIqS9QZ9OrxeQ3skQv Ayg== X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Subject: [Qemu-devel] [PATCH] Makefile: Add missing rule for config-devices.mak X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 #