From mboxrd@z Thu Jan 1 00:00:00 1970 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 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 From: Anthony Liguori Date: Tue, 17 Jul 2012 19:01:00 -0500 Message-Id: <1342569660-12706-1-git-send-email-aliguori@us.ibm.com> Subject: [Qemu-devel] [PATCH] build: fix build breakage due to bad merge List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Anthony Liguori 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) -- 1.7.5.4