From patchwork Thu Jul 10 16:16:01 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 33441 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C7F80203F4 for ; Thu, 10 Jul 2014 16:19:52 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id s7sf10203264qap.3 for ; Thu, 10 Jul 2014 09:19:52 -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:in-reply-to :references: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=AEVJiCdcPdjCAfxS2sKU7Gff0boVMyvl2lUqqp4sRP4=; b=SIdIBmUgp1pcvdt8ftYfaG/IOQcT1GLinF5NCJbl3157s2yJ4Pj3W7cmS48S8oS1uY WEZrBxS5rua+RJnapXTKzDYuW/y2I3ToXVW1Mu4ooNtix2Sk5OWteLCNys5PT3L1gAnB eYo+BM7JRO2OTVL6p3TYkvFJdKwLwdYRJ/K6GsPJ9emr3x02I/OnWIUCchmGEUstJcoe zPKYvrhli58hyqRLjjtSCs6BKIqZxVDOVLC42R6IUOu5kksMkH59u0jdVpU0MrF4NZzW IGeXcnAigOHvA304SGQASFnaqygrXYWU+zPjEBfFkw4eB3t9TXgOB2XgK4qgwWzoEpCI ocYQ== X-Gm-Message-State: ALoCoQmUzJJn82qMzLLwKuWErwpbqiJ3dMXB7sxhRJwq+f289tGdPOJ1zZZqbOk9abxZfTGV53Jy X-Received: by 10.58.169.42 with SMTP id ab10mr23767955vec.13.1405009192230; Thu, 10 Jul 2014 09:19:52 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.46.99 with SMTP id j90ls112944qga.49.gmail; Thu, 10 Jul 2014 09:19:52 -0700 (PDT) X-Received: by 10.220.145.74 with SMTP id c10mr602266vcv.73.1405009192153; Thu, 10 Jul 2014 09:19:52 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id kz4si17941761vdb.74.2014.07.10.09.19.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Jul 2014 09:19:52 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id ij19so10799324vcb.8 for ; Thu, 10 Jul 2014 09:19:52 -0700 (PDT) X-Received: by 10.58.188.199 with SMTP id gc7mr46530544vec.4.1405009192085; Thu, 10 Jul 2014 09:19:52 -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 tc5csp148142vcb; Thu, 10 Jul 2014 09:19:51 -0700 (PDT) X-Received: by 10.180.90.102 with SMTP id bv6mr5588596wib.44.1405009191044; Thu, 10 Jul 2014 09:19:51 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id by15si13367942wib.73.2014.07.10.09.19.39 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 10 Jul 2014 09:19:40 -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 1X5H1p-0006L9-73; Thu, 10 Jul 2014 16:17:01 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X5H1n-0006K8-Pb for xen-devel@lists.xensource.com; Thu, 10 Jul 2014 16:16:59 +0000 Received: from [85.158.137.68:34317] by server-13.bemta-3.messagelabs.com id 15/14-20015-B7CBEB35; Thu, 10 Jul 2014 16:16:59 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1405009015!15259073!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 4811 invoked from network); 10 Jul 2014 16:16:56 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 10 Jul 2014 16:16:56 -0000 X-IronPort-AV: E=Sophos;i="5.01,638,1400025600"; d="scan'208";a="151446160" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 10 Jul 2014 16:16:54 +0000 Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Thu, 10 Jul 2014 12:16:54 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1X5H1c-0001MU-L2; Thu, 10 Jul 2014 17:16:48 +0100 From: Stefano Stabellini To: Date: Thu, 10 Jul 2014 17:16:01 +0100 Message-ID: <1405008961-17187-3-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian.Jackson@eu.citrix.com, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH 3/3] Use the new include subdirectories to build Xen tools 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: stefano.stabellini@eu.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.177 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: Use them to build qemu-xen. Add them to the include path of CFLAGS_libxenguest, CFLAGS_libxenctrl and CFLAGS_libxenstore. Use CFLAGS_libxenctrl and CFLAGS_libxenstore to build the python tools. Signed-off-by: Stefano Stabellini --- tools/Makefile | 6 +++--- tools/Rules.mk | 6 +++--- tools/python/Makefile | 2 ++ 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tools/Makefile b/tools/Makefile index f4aa200..5f32dcc 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -188,9 +188,9 @@ subdir-all-qemu-xen-dir: qemu-xen-dir-find --includedir=$(PREFIX)/lib/xen/include \ --source-path=$$source \ --extra-cflags="-I$(XEN_ROOT)/tools/include \ - -I$(XEN_ROOT)/tools/libxc \ - -I$(XEN_ROOT)/tools/xenstore \ - -I$(XEN_ROOT)/tools/xenstore/compat \ + -I$(XEN_ROOT)/tools/libxc/include \ + -I$(XEN_ROOT)/tools/xenstore/include \ + -I$(XEN_ROOT)/tools/xenstore/compat/include \ $(EXTRA_CFLAGS_QEMU_XEN)" \ --extra-ldflags="-L$(XEN_ROOT)/tools/libxc \ -L$(XEN_ROOT)/tools/xenstore \ diff --git a/tools/Rules.mk b/tools/Rules.mk index 13d8fc1..249bbbb 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -19,15 +19,15 @@ XEN_LIBVCHAN = $(XEN_ROOT)/tools/libvchan CFLAGS_xeninclude = -I$(XEN_INCLUDE) -CFLAGS_libxenctrl = -I$(XEN_LIBXC) $(CFLAGS_xeninclude) +CFLAGS_libxenctrl = -I$(XEN_LIBXC) -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude) LDLIBS_libxenctrl = $(XEN_LIBXC)/libxenctrl.so SHLIB_libxenctrl = -Wl,-rpath-link=$(XEN_LIBXC) -CFLAGS_libxenguest = -I$(XEN_LIBXC) $(CFLAGS_xeninclude) +CFLAGS_libxenguest = -I$(XEN_LIBXC) -I$(XEN_LIBXC)/include $(CFLAGS_xeninclude) LDLIBS_libxenguest = $(XEN_LIBXC)/libxenguest.so SHLIB_libxenguest = -Wl,-rpath-link=L$(XEN_LIBXC) -CFLAGS_libxenstore = -I$(XEN_XENSTORE) $(CFLAGS_xeninclude) +CFLAGS_libxenstore = -I$(XEN_XENSTORE) -I$(XEN_XENSTORE)/include $(CFLAGS_xeninclude) LDLIBS_libxenstore = $(XEN_XENSTORE)/libxenstore.so SHLIB_libxenstore = -Wl,-rpath-link=$(XEN_XENSTORE) diff --git a/tools/python/Makefile b/tools/python/Makefile index eee746d..7c4b281 100644 --- a/tools/python/Makefile +++ b/tools/python/Makefile @@ -5,6 +5,8 @@ include $(XEN_ROOT)/tools/Rules.mk all: build XENPATH = "xen/util/path.py" +CFLAGS += $(CFLAGS_libxenctrl) +CFLAGS += $(CFLAGS_libxenstore) genpath-target = $(call buildmakevars2file,$(XENPATH)) $(eval $(genpath-target))