From patchwork Wed Jul 18 00:01:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony Liguori X-Patchwork-Id: 171577 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 488F42C00C1 for ; Wed, 18 Jul 2012 10:04:19 +1000 (EST) Received: from localhost ([::1]:46896 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrHkW-0007Aj-PC for incoming@patchwork.ozlabs.org; Tue, 17 Jul 2012 20:04:16 -0400 Received: from eggs.gnu.org ([208.118.235.92]:36831) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrHkP-0007Ae-6F for qemu-devel@nongnu.org; Tue, 17 Jul 2012 20:04:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SrHkO-0008A4-3i for qemu-devel@nongnu.org; Tue, 17 Jul 2012 20:04:09 -0400 Received: from e34.co.us.ibm.com ([32.97.110.152]:47128) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrHkN-00089h-O4 for qemu-devel@nongnu.org; Tue, 17 Jul 2012 20:04:08 -0400 Received: from /spool/local by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 17 Jul 2012 18:04:06 -0600 Received: from d03dlp03.boulder.ibm.com (9.17.202.179) by e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 17 Jul 2012 18:01:11 -0600 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by d03dlp03.boulder.ibm.com (Postfix) with ESMTP id 4CF2D19D804E for ; Wed, 18 Jul 2012 00:01:08 +0000 (WET) Received: from d03av05.boulder.ibm.com (d03av05.boulder.ibm.com [9.17.195.85]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6I014kW071438 for ; Tue, 17 Jul 2012 18:01:05 -0600 Received: from d03av05.boulder.ibm.com (loopback [127.0.0.1]) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6I012iV027858 for ; Tue, 17 Jul 2012 18:01:03 -0600 Received: from titi.austin.rr.com (dyn9050022041.mts.ibm.com [9.50.22.41] (may be forged)) by d03av05.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6I011dh027771; Tue, 17 Jul 2012 18:01:01 -0600 From: Anthony Liguori To: qemu-devel@nongnu.org Date: Tue, 17 Jul 2012 19:01:00 -0500 Message-Id: <1342569660-12706-1-git-send-email-aliguori@us.ibm.com> X-Mailer: git-send-email 1.7.5.4 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12071800-1780-0000-0000-0000077EDC73 X-IBM-ISS-SpamDetectors: X-IBM-ISS-DetailInfo: BY=3.00000287; HX=3.00000193; KW=3.00000007; PH=3.00000001; SC=3.00000004; SDB=6.00157517; UDB=6.00035533; UTC=2012-07-18 00:04:04 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 32.97.110.152 Cc: Anthony Liguori Subject: [Qemu-devel] [PATCH] build: fix build breakage due to bad merge X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 34bb443ee74df3780d86044dbf6492eb798c5807 broke the build but in a subtle way. The patch on the ML was actually based on the 1.1.1 stable branch (accidentally). When I merged it from the ML, the fuzzing got resolved in a such a way that the newly introduced Makefile dependency on GENERATED_HEADERS got lost (that was not in 1.1.1). The dist bits also got duplicated (but this is just cosmetic). Signed-off-by: Anthony Liguori --- Makefile | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 720c108..ab82ef3 100644 --- a/Makefile +++ b/Makefile @@ -240,13 +240,6 @@ dist: qemu-$(VERSION).tar.bz2 qemu-%.tar.bz2: $(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.bz2,%,$@)" -VERSION ?= $(shell cat VERSION) - -dist: qemu-$(VERSION).tar.bz2 - -qemu-%.tar.bz2: - $(SRC_PATH)/scripts/make-release "$(SRC_PATH)" "$(patsubst qemu-%.tar.bz2,%,$@)" - distclean: clean rm -f config-host.mak config-host.h* config-host.ld $(DOCS) qemu-options.texi qemu-img-cmds.texi qemu-monitor.texi rm -f config-all-devices.mak @@ -405,6 +398,10 @@ qemu-doc.dvi qemu-doc.html qemu-doc.info qemu-doc.pdf: \ qemu-img.texi qemu-nbd.texi qemu-options.texi \ qemu-monitor.texi qemu-img-cmds.texi +# Add a dependency on the generated files, so that they are always +# rebuilt before other object files +Makefile: $(GENERATED_HEADERS) + # Include automatically generated dependency files # All subdir dependencies come automatically from our recursive subdir rules -include $(wildcard *.d)