From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:57341) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9Ra-0005fA-9S for qemu-devel@nongnu.org; Tue, 15 Jan 2013 11:33:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv9RS-0000Vs-O2 for qemu-devel@nongnu.org; Tue, 15 Jan 2013 11:32:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:39799) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9RS-0000VX-FQ for qemu-devel@nongnu.org; Tue, 15 Jan 2013 11:32:50 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0FGWn4u019392 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 15 Jan 2013 11:32:49 -0500 Received: from redhat.com ([10.35.212.26]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id r0FGWmmW014941 for ; Tue, 15 Jan 2013 11:32:48 -0500 Date: Tue, 15 Jan 2013 18:36:48 +0200 From: "Michael S. Tsirkin" Message-ID: <1d73c0f05575b77c8d67c8c131966ff9294c8650.1358267772.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Subject: [Qemu-devel] [PATCH 1/4] rules.mak: cleanup config generation rules List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This addresses two issues with config generation 1. rule generating timestamp has side effect. Thus cleanup on error does not work. 2. rule for handling timestamp is too generic. It can create any missing .h file. As a result when .h file is removed, build might try to create it using this rule which results in build errors. Signed-off-by: Michael S. Tsirkin --- rules.mak | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/rules.mak b/rules.mak index 6d82c0d..d11a5b4 100644 --- a/rules.mak +++ b/rules.mak @@ -82,12 +82,11 @@ TRACETOOL=$(PYTHON) $(SRC_PATH)/scripts/tracetool.py # Generate timestamp files for .h include files -%.h: %.h-timestamp - @test -f $@ || cp $< $@ +config-%.h: config-%.h-timestamp + @cmp $< $@ >/dev/null 2>&1 || cp $< $@ -%.h-timestamp: %.mak - $(call quiet-command, sh $(SRC_PATH)/scripts/create_config < $< > $@, " GEN $(TARGET_DIR)$*.h") - @cmp $@ $*.h >/dev/null 2>&1 || cp $@ $*.h +config-%.h-timestamp: config-%.mak + $(call quiet-command, sh $(SRC_PATH)/scripts/create_config < $< > $@, " GEN $(TARGET_DIR)config-$*.h") # will delete the target of a rule if commands exit with a nonzero exit status .DELETE_ON_ERROR: -- MST