aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2012-09-16 16:07:13 -0400
committerAurelien Jarno <aurelien@aurel32.net>2012-10-19 20:39:36 +0200
commit7748b8cb1d100105753a80976d2d02ab107d8107 (patch)
tree298996b7086a793ada7c7d38b441c1d34ae55143
parent42a159284570b6fbb0b097e18c7590c094a5188c (diff)
downloadqemu-7748b8cb1d100105753a80976d2d02ab107d8107.zip
qemu-7748b8cb1d100105753a80976d2d02ab107d8107.tar.gz
qemu-7748b8cb1d100105753a80976d2d02ab107d8107.tar.bz2
allow make {dist, }clean work w/out configure
There's no reason to require configure to run before running a clean target, so check MAKECMDGOALS before. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
-rw-r--r--Makefile4
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index a9c22bf..88285a4 100644
--- a/Makefile
+++ b/Makefile
@@ -14,9 +14,11 @@ config-host.mak: $(SRC_PATH)/configure
@sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
else
config-host.mak:
+ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
@echo "Please call configure before running make!"
@exit 1
endif
+endif
GENERATED_HEADERS = config-host.h trace.h qemu-options.def
ifeq ($(TRACE_BACKEND),dtrace)
@@ -403,7 +405,9 @@ qemu-doc.dvi qemu-doc.html qemu-doc.info qemu-doc.pdf: \
# Add a dependency on the generated files, so that they are always
# rebuilt before other object files
+ifneq ($(filter-out %clean,$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))
Makefile: $(GENERATED_HEADERS)
+endif
# Include automatically generated dependency files
# Dependencies in Makefile.objs files come from our recursive subdir rules