summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorStefan Weil <weil@mail.berlios.de>2010-01-14 18:11:43 +0100
committerAurelien Jarno <aurelien@aurel32.net>2010-01-14 20:01:19 +0100
commitb88bc808ea94fae3db0633d9b2b008d722ce1caf (patch)
tree31505a6094a1ac2ad28df1569057236b05c6eb11 /Makefile
parentb3d6b95998a29fd5fe242d7354d64077ea53ae30 (diff)
downloadqemu-b88bc808ea94fae3db0633d9b2b008d722ce1caf.tar.gz
Makefile: Fix message for missing configure
When make is called without a valid configuration, it should tell the user what to do. Revision 0e8c9214ba1d4128cf92442cd343bc3733478261 was a regression which resulted in a message which was no longer user friendly (reported by Aurelien Jarno). This patch restores the old behaviour. Cc: Aurelien Jarno <aurelien@aurel32.net> Reviewed-by: Andreas Färber <afaerber@opensolaris.org> Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index fa7f851eaf..b1bbe6d604 100644
--- a/Makefile
+++ b/Makefile
@@ -75,7 +75,9 @@ SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
subdir-%: $(GENERATED_HEADERS)
$(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $* V="$(V)" TARGET_DIR="$*/" all,)
+ifneq ($(wildcard config-host.mak),)
include $(SRC_PATH)/Makefile.objs
+endif
$(common-obj-y): $(GENERATED_HEADERS)
$(filter %-softmmu,$(SUBDIR_RULES)): $(common-obj-y)