From patchwork Mon Oct 23 11:10:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 116688 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4526240qgn; Mon, 23 Oct 2017 04:20:46 -0700 (PDT) X-Received: by 10.55.110.196 with SMTP id j187mr18431009qkc.192.1508757646849; Mon, 23 Oct 2017 04:20:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508757646; cv=none; d=google.com; s=arc-20160816; b=S7BjTu1LoDGl/Oi2QiFrXigeijcwYnlsgzh1ox85dQ6NTzvOXuyY98ubmRNSeAxiRG bvuMQVCys7OqzKR35vxE8QY8ktxWHOGsPQqUTzZjQ714WukXdGvbEZsOsl73x0q1A7M4 ChLARgevX8iywji1NxnlzPcbUwHKPKRSQ2WrZVRfMPHPAc6HAncdrmbBmfpisb2H5uUz A0CDviD+FH9QaLNM0c5IKNdK8m1iN7NuKqICFqc888fVX9GnKwCMZ+8IldpG6eoE9zn6 dfrhxDHsrnCOt7gqZs6C69HmWqwIRsDfluKtU3cu/AgqobHoaAAk2D2rUb1O0BARbt/T DpIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:delivered-to:arc-authentication-results; bh=wqBBBrZy+g5/JuGTIoyeRl+RLlz4YG+AOYpxxp0bvF8=; b=cBEQxSXSdTrr5O82+Nf63xyr9JoWJM1nRmsODdrXfXV/CQtt1Ws20qb4BEUswW0soQ C9jbrLa/+TnFPIpx/YJ8mB/JbAfEajF8fuNU425ZBuaOCNmkIX8pZN0uEHuLEESI88RI 6fE/CqnW/WpAWuoCSoja0TDFQaqNW8OGDZZM4Jv6r2bZ1XN+XtezTr6944shAubGx9e8 bVlTGcWMV0g+7GR/uhbeWaM2EIk1KNlP38+AfUOY0ocCjZcdY6jGZmohVG5k4kM2H8MU 0FT7OtGHyg9SIo9yziFrhxqsoutvAQEaVk+4rgb/VMk1uouXmdaDOVY9lwEIcJkXJTNS qKaA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id 8si4044501qtp.6.2017.10.23.04.20.46; Mon, 23 Oct 2017 04:20:46 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 75631622A4; Mon, 23 Oct 2017 11:20:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id A6B88622B5; Mon, 23 Oct 2017 11:12:36 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 64AB4622BE; Mon, 23 Oct 2017 11:12:28 +0000 (UTC) Received: from mail-lf0-f66.google.com (mail-lf0-f66.google.com [209.85.215.66]) by lists.linaro.org (Postfix) with ESMTPS id CF20B61DEA for ; Mon, 23 Oct 2017 11:11:17 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id k40so19658148lfi.4 for ; Mon, 23 Oct 2017 04:11:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=wqBBBrZy+g5/JuGTIoyeRl+RLlz4YG+AOYpxxp0bvF8=; b=OafT7YBTC4FO4usS9kFkQnP/3MwRUv9KrSdXRKvi/5ESGOJx4ddko08VfmRuYGY35r L6kjQ/3TUDGhsbtw1szRZGLeRGNY4i7UVLPwlxaKb27+4ujJAk44rk1XeYdCdtvYOpt9 uuFWABr47N0bwuHI5vPpXvu7ULBWhDBNJjH4xy9PrqCozP8ixOdlwkNV4hKEsZ6vvHNM +ZMX62yPm+l1fIOEEFsvubs8B/fD6+ebIxJT9BIJinCQL04bNy19/yIgSM4she/w+JD6 +J/RO9tZxDPyLIi7Ebk2gmpeirH6/iUJEtHzzr7ZbSRfPgZiWii2G9uffMjefYD8ghvh RExA== X-Gm-Message-State: AMCzsaXzcKkqdBCDR/S0BEMwqJvWhSb7Wt6CgRU5RcTTz4aqgQxa/xRH nyHEAiClVvA5EGn5nazFKLnV7mmEgaDF/A== X-Google-Smtp-Source: ABhQp+TKJxLGuIRvviSkt62mLmqtnSoxXPdOXV/G0eqGRNTZkO7aC+UEggtCvmy57fLjnAiqNBAuLQ== X-Received: by 10.46.67.14 with SMTP id q14mr5143829lja.73.1508757076488; Mon, 23 Oct 2017 04:11:16 -0700 (PDT) Received: from rhovanion.lumag.spb.ru ([94.25.228.135]) by smtp.gmail.com with ESMTPSA id i66sm1854643lji.51.2017.10.23.04.11.15 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:15 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:38 +0300 Message-Id: <20171023111057.6328-11-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> References: <20171023111057.6328-1-dmitry.ereminsolenikov@linaro.org> Subject: [lng-odp] [PATCH 10/29] include: install and use ABI headers only in ABI-compat mode X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" There is no need to install ABI headers (or to have them in include path) in non-ABI-compat mode, they should not be used at all. Still provide default ABI headers, because platform may depend on them. Signed-off-by: Dmitry Eremin-Solenikov --- Makefile.inc | 6 +++++- include/Makefile.am | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) -- 2.14.2 diff --git a/Makefile.inc b/Makefile.inc index 10e4041fe662..11fc7c759c85 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -3,9 +3,13 @@ ODP_INCLUDES = \ -I$(top_srcdir)/platform/@with_platform@/include \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include \ - -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ -I$(top_srcdir)/include +if ODP_ABI_COMPAT +ODP_INCLUDES += \ + -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ +endif + HELPER_INCLUDES = \ -I$(top_srcdir)/helper/include diff --git a/include/Makefile.am b/include/Makefile.am index d841e65b8795..9437f5f68d5a 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -110,6 +110,9 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/queue.h \ odp/api/abi-default/shared_memory.h +# Insall ABI headers only if required +if ODP_ABI_COMPAT + odpapiabiarchincludedir= $(includedir)/odp/api/abi if ARCH_IS_ARM odpapiabiarchinclude_HEADERS = \ @@ -321,6 +324,7 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/traffic_mngr.h \ odp/arch/x86_64-linux/odp/api/abi/version.h endif +endif # ODP_ABI_COMPAT # Rerefence all nodist_*_HEADERS here .PHONY: $(nodist_odpapispecinclude_HEADERS)