From patchwork Thu Jul 10 16:19:33 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 33443 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 45CBC203F4 for ; Thu, 10 Jul 2014 16:25:26 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id t59sf36531911yho.2 for ; Thu, 10 Jul 2014 09:25:26 -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:date:from:to:message-id:user-agent :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=aYVYpdNKbh7ol6OtxB7pl2jiUW5WMXMGYfM4sXkKiwg=; b=FD9MGhwx55x9J1RKf0qAxVzgmX+WQ+c2VtowatVcWNPWui19j6l2YyxMJyQxshhzCJ 76lKJUyvSeJY/NbxsL6aTt8TEULVPqapx8OWfem/MxXc4VnsoU32FRUrSO6oWm2Xh+pK mOrTVti+tPpCjhXhyziTJSAf6p6Z5pvwxGgV2uYxGq/wNBt2ygqW/Tvv/p1FMtk8M3Ye Mx5md1kDMAzjLUPW5k1HpqIWy6ZQvgqAEUJHUNBTayyy1kIjjpBRq+v0Oxm46SGtLK4e 1lSuuqaDM+dNMjoE/31vrw2mDg18UrvbEToCuD4OGBiU69ET9gGFkCikkwxw4hXeUYfj wlCA== X-Gm-Message-State: ALoCoQkeqr6JLGBI0ZDUSMGGzRc0+Gdb+vOnvJ/ongxfq4TuvHZO4nod3dNj4gZFEMUI0UK7kb5M X-Received: by 10.58.202.40 with SMTP id kf8mr21773104vec.39.1405009526003; Thu, 10 Jul 2014 09:25:26 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.83.50 with SMTP id i47ls121109qgd.38.gmail; Thu, 10 Jul 2014 09:25:25 -0700 (PDT) X-Received: by 10.220.59.65 with SMTP id k1mr4224798vch.22.1405009525911; Thu, 10 Jul 2014 09:25:25 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id wr7si23192916vcb.15.2014.07.10.09.25.25 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Jul 2014 09:25:25 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id hy10so11149623vcb.3 for ; Thu, 10 Jul 2014 09:25:25 -0700 (PDT) X-Received: by 10.221.34.13 with SMTP id sq13mr22752665vcb.16.1405009525810; Thu, 10 Jul 2014 09:25:25 -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 tc5csp148596vcb; Thu, 10 Jul 2014 09:25:25 -0700 (PDT) X-Received: by 10.194.24.36 with SMTP id r4mr57540287wjf.35.1405009524707; Thu, 10 Jul 2014 09:25:24 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id wd7si53689885wjc.60.2014.07.10.09.25.20 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 10 Jul 2014 09:25:20 -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 1X5H8S-0000Kb-Iy; Thu, 10 Jul 2014 16:23:52 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1X5H8R-0000KA-3W for xen-devel@lists.xensource.com; Thu, 10 Jul 2014 16:23:51 +0000 Received: from [193.109.254.147:50229] by server-3.bemta-14.messagelabs.com id E6/69-13460-61EBEB35; Thu, 10 Jul 2014 16:23:50 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-12.tower-27.messagelabs.com!1405009424!16699240!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 30245 invoked from network); 10 Jul 2014 16:23:45 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-12.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 10 Jul 2014 16:23:45 -0000 X-IronPort-AV: E=Sophos;i="5.01,638,1400025600"; d="scan'208";a="151726119" Received: from accessns.citrite.net (HELO FTLPEX01CL01.citrite.net) ([10.9.154.239]) by FTLPIPO02.CITRIX.COM with ESMTP; 10 Jul 2014 16:20:21 +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:20:20 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1X5H51-0001Pr-Nv; Thu, 10 Jul 2014 17:20:19 +0100 Date: Thu, 10 Jul 2014 17:19:33 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Jackson , Ian Campbell , Stefano Stabellini Subject: [Xen-devel] [PATCH] include tools/libxc/include and tools/xenstore/include 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.172 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: The public libxc and xenstore headers have been moved to tools/libxc/include and tools/xenstore/include respectively. Change the Makefiles accordingly. Signed-off-by: Stefano Stabellini diff --git a/Makefile b/Makefile index 37c7066..c1900ca 100644 --- a/Makefile +++ b/Makefile @@ -46,9 +46,9 @@ $(filter %-user,$(SUBDIR_RULES)): libqemu_user.a recurse-all: $(SUBDIR_RULES) -CPPFLAGS += -I$(XEN_ROOT)/tools/libxc +CPPFLAGS += -I$(XEN_ROOT)/tools/libxc/include CPPFLAGS += -I$(XEN_ROOT)/tools/blktap/lib -CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore +CPPFLAGS += -I$(XEN_ROOT)/tools/xenstore/include CPPFLAGS += -I$(XEN_ROOT)/tools/include tapdisk-ioemu: tapdisk-ioemu.c cutils.c block.c block-raw.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c block-bochs.c block-vpc.c block-vvfat.c block-qcow2.c hw/xen_blktap.c osdep.c diff --git a/xen-hooks.mak b/xen-hooks.mak index 58d61c9..9263892 100644 --- a/xen-hooks.mak +++ b/xen-hooks.mak @@ -1,5 +1,5 @@ -CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc -CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore +CPPFLAGS+= -I$(XEN_ROOT)/tools/libxc/include +CPPFLAGS+= -I$(XEN_ROOT)/tools/xenstore/include CPPFLAGS+= -I$(XEN_ROOT)/tools/include SSE2 := $(call cc-option,-msse2,)