From patchwork Mon Aug 4 13:29:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 34835 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8FDF821F5F for ; Mon, 4 Aug 2014 13:32:38 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id i7sf40376173oag.0 for ; Mon, 04 Aug 2014 06:32:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :list-archive:content-type:content-transfer-encoding; bh=WGdufdCVlHMnfDS3AlFmb8QLQAvtU4HHYaSl2wf4VPo=; b=dWR9A4EHG+FdNXcvGZUKKeK5V9mxtijdfreSHpp3rN49nY+JhBUThO5nu3ttJJnolm 5U8GmIaJTmO3lYYL5Mziq/ADHon/9BiqOuFtWxOFTDuRv7mIGVBDNKc+DBR36v4jkwzD eUR6wt2VAd0fkp8fq7VYvB0mOR2oMyD1CqRf628PT5Cwz2jt5LNQteq/eggmIuEM1Hyg z2hZmme9VimGXWRERkzKiLgM2AbHQPboJBk/mLQCdnTLTHf85ZqlQhqDlK/LjTuIW8m+ tXVpPe5fpNnRIdmvgtFAwEGGhzQ49C4KodkYhvbOYvO9h7NL88MZYz23y20kNr+r1lli KldA== X-Gm-Message-State: ALoCoQm5IWYpg20EbCIyWnzpUGbPAxpxWgziBuF254OWHxbYpwok7okDlX3PbqcLucBYPicEKaH6 X-Received: by 10.50.73.5 with SMTP id h5mr8761761igv.2.1407159157804; Mon, 04 Aug 2014 06:32:37 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.133 with SMTP id b5ls2103260qgb.43.gmail; Mon, 04 Aug 2014 06:32:37 -0700 (PDT) X-Received: by 10.221.59.194 with SMTP id wp2mr1953149vcb.59.1407159157628; Mon, 04 Aug 2014 06:32:37 -0700 (PDT) Received: from mail-vc0-f179.google.com (mail-vc0-f179.google.com [209.85.220.179]) by mx.google.com with ESMTPS id n4si11880210vda.71.2014.08.04.06.32.37 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 04 Aug 2014 06:32:37 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) client-ip=209.85.220.179; Received: by mail-vc0-f179.google.com with SMTP id hq11so10904560vcb.24 for ; Mon, 04 Aug 2014 06:32:37 -0700 (PDT) X-Received: by 10.220.97.5 with SMTP id j5mr23438347vcn.16.1407159157520; Mon, 04 Aug 2014 06:32:37 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp304841vcb; Mon, 4 Aug 2014 06:32:37 -0700 (PDT) X-Received: by 10.70.103.106 with SMTP id fv10mr24331535pdb.63.1407159156615; Mon, 04 Aug 2014 06:32:36 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id i8si19479317icr.32.2014.08.04.06.32.36 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 04 Aug 2014 06:32:36 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEIKc-0004gh-7e; Mon, 04 Aug 2014 13:29:42 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XEIKa-0004gc-AZ for xen-devel@lists.xen.org; Mon, 04 Aug 2014 13:29:40 +0000 Received: from [85.158.143.35:24394] by server-2.bemta-4.messagelabs.com id 8C/C2-04525-3CA8FD35; Mon, 04 Aug 2014 13:29:39 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1407158977!13295286!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 7720 invoked from network); 4 Aug 2014 13:29:38 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-11.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 4 Aug 2014 13:29:38 -0000 X-IronPort-AV: E=Sophos;i="5.01,798,1400025600"; d="scan'208";a="159106849" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.80) with Microsoft SMTP Server id 14.3.181.6; Mon, 4 Aug 2014 09:29:18 -0400 Received: from cosworth.uk.xensource.com ([10.80.16.52] helo=localhost.localdomain ident=ianc) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1XEIKD-0000IK-Hi; Mon, 04 Aug 2014 14:29:18 +0100 Received: by localhost.localdomain (sSMTP sendmail emulation); Mon, 04 Aug 2014 14:29:17 +0100 From: Ian Campbell To: , Date: Mon, 4 Aug 2014 14:29:17 +0100 Message-ID: <5ddf6d99ba377d87f8c6750fac0037d06415801f.1407158957.git.ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.10.4 MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , "Luis R. Rodriguez" Subject: [Xen-devel] [PATCH] Makefile inclusion of Paths.mk should be conditional X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.179 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Since it may not exist when doing e.g. "make clean". There is existing logic in the makefiles which will raise an error if an actual build target is invoked without having run configure. Signed-off-by: Ian Campbell Cc: Luis R. Rodriguez Acked-by: Ian Jackson --- Luis, any reason why config/Stubdom.mk.in in one case and tools/Rules.mk in the other? --- config/Stubdom.mk.in | 2 +- tools/Rules.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/Stubdom.mk.in b/config/Stubdom.mk.in index 6bce206..c1c83bc 100644 --- a/config/Stubdom.mk.in +++ b/config/Stubdom.mk.in @@ -1,5 +1,5 @@ # Prefix and install folder -include $(XEN_ROOT)/config/Paths.mk +-include $(XEN_ROOT)/config/Paths.mk prefix := @prefix@ PREFIX := $(prefix) exec_prefix := @exec_prefix@ diff --git a/tools/Rules.mk b/tools/Rules.mk index 0aa1e6b..5bac700 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -5,7 +5,7 @@ all: -include $(XEN_ROOT)/config/Tools.mk include $(XEN_ROOT)/Config.mk -include $(XEN_ROOT)/config/Paths.mk +-include $(XEN_ROOT)/config/Paths.mk export _INSTALL := $(INSTALL) INSTALL = $(XEN_ROOT)/tools/cross-install