From cb5fc67db90d80c5dddbd7be1044cc10ef471974 Mon Sep 17 00:00:00 2001 From: Anthony Liguori Date: Tue, 17 Jul 2012 18:58:20 -0500 Subject: [PATCH] build: fix build breakage due to bad merge 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 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 720c1080db..ab82ef3dcb 100644 --- a/Makefile +++ b/Makefile @@ -237,13 +237,6 @@ VERSION ?= $(shell cat VERSION) 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,%,$@)" @@ -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)