From patchwork Sun Sep 16 20:07:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 184147 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 7E8042C007E for ; Mon, 17 Sep 2012 06:07:16 +1000 (EST) Received: from localhost ([::1]:37674 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDL7a-00012V-G9 for incoming@patchwork.ozlabs.org; Sun, 16 Sep 2012 16:07:14 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDL7V-00012Q-3k for qemu-devel@nongnu.org; Sun, 16 Sep 2012 16:07:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDL7U-0004Pz-6i for qemu-devel@nongnu.org; Sun, 16 Sep 2012 16:07:09 -0400 Received: from smtp.gentoo.org ([140.211.166.183]:46089) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDL7U-0004Pt-0w for qemu-devel@nongnu.org; Sun, 16 Sep 2012 16:07:08 -0400 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 0779033C9EB for ; Sun, 16 Sep 2012 20:07:06 +0000 (UTC) From: Mike Frysinger To: qemu-devel@nongnu.org Date: Sun, 16 Sep 2012 16:07:13 -0400 Message-Id: <1347826033-4330-1-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 1.7.9.7 In-Reply-To: <5055A16F.4040303@redhat.com> References: <5055A16F.4040303@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 140.211.166.183 Subject: [Qemu-devel] [PATCH v2] allow make {dist, }clean work w/out configure X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org There's no reason to require configure to run before running a clean target, so check MAKECMDGOALS before. Signed-off-by: Mike Frysinger --- v2 - handle edge cases Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 1cd5bc8..0a37369 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) @@ -398,7 +400,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