summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorJuan Quintela2009-10-07 02:40:59 +0200
committerAnthony Liguori2009-10-09 04:17:03 +0200
commite5efe7f5d2ac78a72c9fe3b2217177d2ce1502ec (patch)
treecaa99e75a41f40d62a8e0d63eb13ad7d8edba924 /Makefile
parentMove generation of config-host.h to Makefile from configure (diff)
downloadqemu-e5efe7f5d2ac78a72c9fe3b2217177d2ce1502ec.tar.gz
qemu-e5efe7f5d2ac78a72c9fe3b2217177d2ce1502ec.tar.xz
qemu-e5efe7f5d2ac78a72c9fe3b2217177d2ce1502ec.zip
Remove useless check for config-host.mak
If config-host.mak dont' exist, we have exited in the check at the beginning of the file. Once here, move the bits to the else part of the test at the beginning of the file. Patchworks-ID: 35191 Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 3 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 144b392ca7..9169dd50f6 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,9 @@ ifneq ($(wildcard config-host.mak),)
all: build-all
include config-host.mak
include $(SRC_PATH)/rules.mak
+config-host.mak: configure
+ @echo $@ is out-of-date, running configure
+ @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
else
config-host.mak:
@echo "Please call configure before running make!"
@@ -34,12 +37,6 @@ SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory)
build-all: config-host.h
$(call quiet-command, $(MAKE) $(SUBDIR_MAKEFLAGS) $(TOOLS) $(DOCS) recurse-all,)
-config-host.mak: configure
-ifneq ($(wildcard config-host.mak),)
- @echo $@ is out-of-date, running configure
- @sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh
-endif
-
config-host.h: config-host.h-timestamp
config-host.h-timestamp: config-host.mak