From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NVTFU-00087M-4C
	for qemu-devel@nongnu.org; Thu, 14 Jan 2010 12:12:44 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1NVTFP-00084x-C2
	for qemu-devel@nongnu.org; Thu, 14 Jan 2010 12:12:43 -0500
Received: from [199.232.76.173] (port=36504 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NVTFP-00084q-6z
	for qemu-devel@nongnu.org; Thu, 14 Jan 2010 12:12:39 -0500
Received: from moutng.kundenserver.de ([212.227.17.10]:57573)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <stefan@weilnetz.de>) id 1NVTFO-0000vC-FK
	for qemu-devel@nongnu.org; Thu, 14 Jan 2010 12:12:38 -0500
From: Stefan Weil <weil@mail.berlios.de>
Date: Thu, 14 Jan 2010 18:11:43 +0100
Message-Id: <1263489103-8419-1-git-send-email-weil@mail.berlios.de>
In-Reply-To: <20100114145026.GA7789@volta.aurel32.net>
References: <20100114145026.GA7789@volta.aurel32.net>
Subject: [Qemu-devel] [PATCH] Makefile: Fix message for missing configure
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: QEMU Developers <qemu-devel@nongnu.org>, afaerber@opensolaris.org
Cc: Aurelien Jarno <aurelien@aurel32.net>

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>
Signed-off-by: Stefan Weil <weil@mail.berlios.de>
---
 Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/Makefile b/Makefile
index fa7f851..b1bbe6d 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)
-- 
1.6.5