From patchwork Tue Aug 16 05:34:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Lacombe X-Patchwork-Id: 1070382 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p7G5Ykox011995 for ; Tue, 16 Aug 2011 05:34:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752392Ab1HPFeb (ORCPT ); Tue, 16 Aug 2011 01:34:31 -0400 Received: from mail-gx0-f174.google.com ([209.85.161.174]:47112 "EHLO mail-gx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752844Ab1HPFe2 (ORCPT ); Tue, 16 Aug 2011 01:34:28 -0400 Received: by mail-gx0-f174.google.com with SMTP id 21so3607034gxk.19 for ; Mon, 15 Aug 2011 22:34:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=jx+xo3rEzfq3DefjJrUE1BdKX7O3STRzxCfOv504Kzg=; b=MoUP0KHdbNXlURWB8cYB9vNdeDSucT7zZ11jy/ETzUrlWNSmfjTF4k0C966+RSuD7g deMR8JWWbP9fIfbiNnHOXqVq3tN9Z5Qf6Xc/9XbEKcucmSj1QkkSF/3xrQjtXhQX0Btr ytVNlfn5WY+6ttrgNOjwrlAOJVmdqI/qQ0KHs= Received: by 10.236.175.40 with SMTP id y28mr14544338yhl.93.1313472868012; Mon, 15 Aug 2011 22:34:28 -0700 (PDT) Received: from localhost.localdomain (69-165-142-232.dsl.teksavvy.com [69.165.142.232]) by mx.google.com with ESMTPS id e21sm985275yhn.77.2011.08.15.22.34.26 (version=SSLv3 cipher=OTHER); Mon, 15 Aug 2011 22:34:27 -0700 (PDT) From: Arnaud Lacombe To: Michal Marek Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org, Arnaud Lacombe Subject: [PATCH 3/4] kbuild: do not hardcode .config Date: Tue, 16 Aug 2011 01:34:13 -0400 Message-Id: <1313472854-14426-4-git-send-email-lacombar@gmail.com> X-Mailer: git-send-email 1.7.6.153.g78432 In-Reply-To: <1313472854-14426-1-git-send-email-lacombar@gmail.com> References: <1313472854-14426-1-git-send-email-lacombar@gmail.com> Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Tue, 16 Aug 2011 05:34:47 +0000 (UTC) Signed-off-by: Arnaud Lacombe --- Makefile | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e7b576e..c36195a 100644 --- a/Makefile +++ b/Makefile @@ -973,7 +973,7 @@ PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3 prepare3: include/config/kernel.release ifneq ($(KBUILD_SRC),) @$(kecho) ' Using $(srctree) as source for kernel' - $(Q)if [ -f $(srctree)/.config -o -d $(srctree)/include/config ]; then \ + $(Q)if [ -f $(srctree)/$(KBUILD_CONFIG) -o -d $(srctree)/include/config ]; then \ echo " $(srctree) is not clean, please run 'make mrproper'";\ echo " in the '$(srctree)' directory.";\ /bin/false; \ @@ -1168,7 +1168,7 @@ CLEAN_FILES += vmlinux System.map \ # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config usr/include include/generated \ arch/*/include/generated -MRPROPER_FILES += .config .config.old .version .old_version \ +MRPROPER_FILES += $(KBUILD_CONFIG) $(KBUILD_CONFIG).old .version .old_version \ include/linux/version.h \ Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS @@ -1295,7 +1295,7 @@ help: @echo ' make V=0|1 [targets] 0 => quiet build (default), 1 => verbose build' @echo ' make V=2 [targets] 2 => give reason for rebuild of target' - @echo ' make O=dir [targets] Locate all output files in "dir", including .config' + @echo ' make O=dir [targets] Locate all output files in "dir", including $(KBUILD_CONFIG)' @echo ' make C=1 [targets] Check all c source with $$CHECK (sparse by default)' @echo ' make C=2 [targets] Force check of all c source with $$CHECK' @echo ' make RECORDMCOUNT_WARN=1 [targets] Warn about ignored mcount sections'