From patchwork Mon Oct 23 11:10:37 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: 116687 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4525634qgn; Mon, 23 Oct 2017 04:20:07 -0700 (PDT) X-Received: by 10.200.56.193 with SMTP id g1mr19205353qtc.67.1508757607262; Mon, 23 Oct 2017 04:20:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508757607; cv=none; d=google.com; s=arc-20160816; b=YQpIR6wiNY8b2AqvB+Ngeu+FDigSdgfHjpK7fDjxjV2d3p6iEbwuJYadt1favTPPEW Yf4t+XDQ2nTa7I71pMsCtFVfA847AgXQp1ReLeLX+t9u0MerbfFEIljtimDFyBOWYav6 ETyYBx7U/kntI73zhFyN12qwkMrpec6T1Y5JI6VeFSB3XHMVKYWUirkbPZ9o0009fkHd xunNzZvWw7zQocqqFafVD8KADZI3QOvgs1rIJ+hXJQ7lA9JeznOwEeOBEOLoIjvzFSF3 yREQW52YGt13dsY6dZUhQnjUYKT/yTYjKTclGNPNfCcnLmWzoCpamTsEWVPOZk+9gUAo EH0g== 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=skJZWsDJ7NoPZqdxhCC9u3PuQvdTmIXVx55cJd27KXQ=; b=N9cydxhcVIKRcXXenYzuWIODkHpTYT5G+4Y2VKLlnJwENAQDJDpfoW6u+Vfi7iiGef DFtCHAoieRm7Gia8J+AyUfzacNpDVGkC/NsTvWPf3CHBn56a9UApR8f+FnfkKBnIUG8L vrGxkmt756XcxmrYX5dNY4kUYxqqb8XExTXiEo9On0fyr9mb0TVYhSf4SORYT9JYUgog u5Prw2VMPCwFGkUwGNTc55nPeSCMfP+xU3VYjYl41fzlKOW5YUqgFHOmOiPazd84qHFw HaX8Ka4HJdulJjvABmamNFkz/0TF286ko1cRohM9aXWjz7NdHFiWo/tEi5aSBWPc6+bv /cKw== 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 w18si390630qtj.11.2017.10.23.04.20.06; Mon, 23 Oct 2017 04:20:07 -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 B55C860385; Mon, 23 Oct 2017 11:20:06 +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 321E5622A1; Mon, 23 Oct 2017 11:12:24 +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 E89E1622A1; Mon, 23 Oct 2017 11:12:20 +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 C9ECF61DE2 for ; Mon, 23 Oct 2017 11:11:16 +0000 (UTC) Received: by mail-lf0-f66.google.com with SMTP id w21so19688492lfc.6 for ; Mon, 23 Oct 2017 04:11:16 -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=skJZWsDJ7NoPZqdxhCC9u3PuQvdTmIXVx55cJd27KXQ=; b=rIkg0j3B84POWmX+IPJBgDmnhkOEuvZJucqyQMJ/nW54xAiXymsHp18/gY8uLnhqJ4 h5PMFukdnKW/XVy5H20nPIf2+TAavO53MAlddcyXvicTGqytPyvQwWD+LHfcAzyusu5T Pm/O2u9+t6B4sVICa7oTgGR6l7/5UfRCIoPcHLRac155JIEcVu/YUhwvOtMmZ9VH3YV+ M4hq03V7r/6OfQ07WGh5quvD8R6oDMTfBP072ZwfSU5IekSv7JwKZw8mJ6FxShUxxWQ8 Y98W1xDMcTLzTO8Cjz/8gRIESmd3rofJi6Ja2m70ollqE7W7W3VEolDYJ7QiopLisOj6 THQQ== X-Gm-Message-State: AMCzsaVILZ/qzm4XvzcUbCHtXfwKVIPwmVWJSs0DfZaSMWIOzF4ZcDIe 1xkqngXdpBR/Z0eENES8B5Xph8A7Yzo0UQ== X-Google-Smtp-Source: ABhQp+RHG0kXxK0Vf8ltsAQQoKXxyc2kDp4RsIUO/xXgePyF2hJ8QGhBJ+iZU3x9twqgc9FCLtuivw== X-Received: by 10.46.56.20 with SMTP id f20mr5427260lja.189.1508757075479; Mon, 23 Oct 2017 04:11:15 -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.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 04:11:14 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 23 Oct 2017 14:10:37 +0300 Message-Id: <20171023111057.6328-10-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 09/29] include: install ABI headers without additional ARCH_ABI level 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" Install ABI headers directly to odp/api/abi, removing the need for extra symlink. Signed-off-by: Dmitry Eremin-Solenikov --- include/Makefile.am | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) -- 2.14.2 diff --git a/include/Makefile.am b/include/Makefile.am index 5328133dd4e4..d841e65b8795 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -110,7 +110,7 @@ odpapiabidefaultinclude_HEADERS = \ odp/api/abi-default/queue.h \ odp/api/abi-default/shared_memory.h -odpapiabiarchincludedir= $(includedir)/odp/arch/@ARCH_ABI@/odp/api/abi +odpapiabiarchincludedir= $(includedir)/odp/api/abi if ARCH_IS_ARM odpapiabiarchinclude_HEADERS = \ odp/arch/arm32-linux/odp/api/abi/atomic.h \ @@ -322,16 +322,6 @@ odpapiabiarchinclude_HEADERS = \ odp/arch/x86_64-linux/odp/api/abi/version.h endif -# Create symlink for ABI header files. Application does not need to use the arch -# specific include path for installed files. -install-data-hook: - if [ -h $(DESTDIR)$(prefix)/include/odp/api/abi ]; then \ - : ; \ - else \ - $(LN_S) -rf $(DESTDIR)$(prefix)/include/odp/arch/@ARCH_ABI@/odp/api/abi \ - $(DESTDIR)$(prefix)/include/odp/api/abi; \ - fi - # Rerefence all nodist_*_HEADERS here .PHONY: $(nodist_odpapispecinclude_HEADERS) $(nodist_odpapispecinclude_HEADERS):