From patchwork Mon Sep 11 18:59:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 112215 Delivered-To: patch@linaro.org Received: by 10.80.202.13 with SMTP id d13csp4965365edi; Mon, 11 Sep 2017 12:04:06 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCepvUCKZhRneuIpXbafBqzU4dreCpUWnALV/yZD6ExubAgAkqojZegNiBh8XSoKObc6Kxg X-Received: by 10.55.164.12 with SMTP id n12mr17428063qke.246.1505156646519; Mon, 11 Sep 2017 12:04:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505156646; cv=none; d=google.com; s=arc-20160816; b=Fe7/IXzzRSHraJWo7Z8VSwrGUa+2v0IbtWzu5wYKHpXw2IBEKoKLZqb3avEDry0q04 Q/x/m5Nx3gV4ZGqEFWEma4kFjJtbKFtFKbkwg05JtAe4WUHTIt2X0V7AM2UlgK/WyPPj SjfoMLibt2vSUEOnckZTLJea7OJF1BWgwXyT7ji4nDo+vChQ4lYwGu/pHIHTur72DPdW VtvddtEEKYK4cDPZNx+MIGboieRgjECUw6sdVUmII+3bbSnIaa/fof/Kx1ciKKkKwpWB tYHFiMmiHhX8X4c66pP3HlUF4qbmaIzmg3YvuXcfRt2XdOFEj9oPvaT01gv+fhC7q/zz WByg== 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:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=cvX9LcGwKjtnrsLDJ2cYkhHkI958t+QggQ79XWr9TTk=; b=hYyRcDGSr1PWacuQQXsxHaHDQ9sbEs8YjohcEBOEQyLHzbrF8409IIbgReyNS2mrwE YwV6K7OAJYftbvzYcu7U2UJbdToxUA1ohz7bkcNU0l1Yg9q3cevd3kZtFSCQ+FHZN27K NCcL8hadLw9eppC9F5/0CKDpiDFxrIqotW2zMIasC7DDQoLD2aaAj0eRxcdneOQBRhaC IMMtkEfq0TyJfVvhIXlUpHkR3ikY4KHTRt/xhZVFK0y9p3MbB13Fjd8X9Ja4H6wD4y+2 0EkZDLbQh3ViYkZtkDpPRtlUgFFvvD3qoR6D7Buvc7fL7KnwAAGGXKBAYxAYFDm2knp2 2fTg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id a47si8772791qte.86.2017.09.11.12.04.06; Mon, 11 Sep 2017 12:04:06 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id 316F860D8F; Mon, 11 Sep 2017 19:04: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=-2.6 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_LOW,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 3250361613; Mon, 11 Sep 2017 19:00:50 +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 676E960D8E; Mon, 11 Sep 2017 19:00:31 +0000 (UTC) Received: from forward101o.mail.yandex.net (forward101o.mail.yandex.net [37.140.190.181]) by lists.linaro.org (Postfix) with ESMTPS id A4D0660D8E for ; Mon, 11 Sep 2017 19:00:26 +0000 (UTC) Received: from mxback10o.mail.yandex.net (mxback10o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::24]) by forward101o.mail.yandex.net (Yandex) with ESMTP id 29D1C13428EB for ; Mon, 11 Sep 2017 22:00:25 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback10o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 9z7uN5m5SP-0PGqenrO; Mon, 11 Sep 2017 22:00:25 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Xiwxkqm3eV-0OlWl51Y; Mon, 11 Sep 2017 22:00:24 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Mon, 11 Sep 2017 21:59:56 +0300 Message-Id: <1505156408-13887-8-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1505156408-13887-1-git-send-email-odpbot@yandex.ru> References: <1505156408-13887-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 173 Subject: [lng-odp] [PATCH API-NEXT v1 7/19] build: use AM_CPPFLAGS to set include paths, rather than AM_CFLAGS 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" From: Dmitry Eremin-Solenikov Signed-off-by: Dmitry Eremin-Solenikov Reviewed-by: Bill Fischofer Signed-off-by: Maxim Uvarov --- /** Email created from pull request 173 (muvarov:api-next) ** https://github.com/Linaro/odp/pull/173 ** Patch: https://github.com/Linaro/odp/pull/173.patch ** Base sha: 7fa8e2c97ed18f8dd6e95cbc78b7e668ccb98869 ** Merge commit sha: 057be0905a62a157cc96a91743ea70e66e8554ca **/ helper/Makefile.am | 14 +++++++------- helper/test/Makefile.am | 2 +- platform/linux-generic/Makefile.am | 12 ++++++------ test/Makefile.inc | 3 +-- 4 files changed, 15 insertions(+), 16 deletions(-) diff --git a/helper/Makefile.am b/helper/Makefile.am index ca512ff1..fa503f1a 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -2,13 +2,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc LIB = $(top_builddir)/lib -AM_CFLAGS += -I$(srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/include -AM_CFLAGS += -I$(top_srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ -AM_CFLAGS += -I$(top_builddir)/platform/@with_platform@/include -AM_CFLAGS += -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ -AM_CFLAGS += -I$(top_builddir)/include +AM_CPPFLAGS += -I$(srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/platform/@with_platform@/include +AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ +AM_CPPFLAGS += -I$(top_builddir)/platform/@with_platform@/include +AM_CPPFLAGS += -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ +AM_CPPFLAGS += -I$(top_builddir)/include AM_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)' diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index 00997f10..fdc15f96 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -17,7 +17,7 @@ INCFLAGS = \ ODP_PLATFORM=${with_platform} -AM_CFLAGS += $(INCFLAGS) +AM_CPPFLAGS += $(INCFLAGS) AM_LDFLAGS += -static EXECUTABLES = chksum$(EXEEXT) \ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index eada421c..e644505e 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -3,12 +3,12 @@ include $(top_srcdir)/platform/Makefile.inc -AM_CFLAGS += -I$(srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/include -AM_CFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ -AM_CFLAGS += -I$(top_builddir)/include -AM_CFLAGS += -Iinclude -AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) +AM_CPPFLAGS += -I$(srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include +AM_CPPFLAGS += -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ +AM_CPPFLAGS += -I$(top_builddir)/include +AM_CPPFLAGS += -Iinclude +AM_CPPFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) AM_CPPFLAGS += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) diff --git a/test/Makefile.inc b/test/Makefile.inc index d701ebd7..f5bb7674 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -15,9 +15,8 @@ INCFLAGS = \ -I$(top_srcdir)/test \ -I$(top_builddir)/include -AM_CFLAGS += $(INCFLAGS) +AM_CPPFLAGS = $(INCFLAGS) AM_CFLAGS += $(CUNIT_CFLAGS) -AM_CXXFLAGS = $(INCFLAGS) AM_LDFLAGS += -L$(LIB)