From patchwork Tue Sep 5 20:00:00 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: 111727 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp3303732qge; Tue, 5 Sep 2017 13:06:47 -0700 (PDT) X-Google-Smtp-Source: ADKCNb4e2lgbGHwKZ66DgjG3NdLwWkC+crG+CYOBKUXiH83HRKoc7zGk6l4c7Rfm1F8e+7p6lKCh X-Received: by 10.200.39.70 with SMTP id h6mr342944qth.227.1504642007165; Tue, 05 Sep 2017 13:06:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504642007; cv=none; d=google.com; s=arc-20160816; b=FMaqBWOhzfLMBSXd2TElA9TAyixfdKNp8QMih9ShjCW6w7lgjGcDp9EiFtaiGzlr4l VdgIUhaH+z49tlnJoWK25u1HG7nVjwFuMh+TQk9XYYo0Yb8t86yTGkO3P+SuDGsYrcr0 9YDJB39qqgA//rvD+uT55kjttPx+kdP0s0z8CSpXew6s7HYYWPuyhA7izfFyir5MEaHS pRLQL5LCE+tHaEJ+NwE/715Z5I0ZD/c7be4S7CSRuggOpyWf/TQkr9dhKtxnhDJ608TP K1RhLzwm6ogwCtNJtsetjRFLnC4WMlste1rbTbcxOy2Kt+XvbmJZCm7UocVvTha6ydUJ u08A== 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=Sk8znlxB2AeBsqrL8G09OFCUfm3N6I0YZd77+advnZ8=; b=PecKDsBxVSsfmYpor0vdR3nlxJtvjRqiX5zHH7ACU00hbJW+varB44ZMe6s6CZzRok DVV/1qRILyLRtan4v/uwJ+BTtjMUtdyA2uZQ60pPOHsfO3XSlOOERkzjAyKPu24sqVQE xVskcJntHlx67gUU+ZeE62vR7CD2mTzaMf96zqR1TWkJmteCHWPUGpkEJn97kbyhFXkP 854TFWtvjaVG+oaMxQfVLmR9pRCj16MiL2wIwgm0gljH3q9/+11R6h7bqo9igZ5XcuZf 0f4Q6pBFFq+HbwKcM263lKsRJMTCRieeGNphPWKxAPLdzKCd2OhK0td2eEYRShV1nqZN uH+Q== 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 c18si1034029qtk.381.2017.09.05.13.06.46; Tue, 05 Sep 2017 13:06:47 -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 C910960CE2; Tue, 5 Sep 2017 20:06: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.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE 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 092496156C; Tue, 5 Sep 2017 20:01:05 +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 8DA4860D3A; Tue, 5 Sep 2017 20:00:31 +0000 (UTC) Received: from forward106o.mail.yandex.net (forward106o.mail.yandex.net [37.140.190.187]) by lists.linaro.org (Postfix) with ESMTPS id AE78960D7D for ; Tue, 5 Sep 2017 20:00:20 +0000 (UTC) Received: from mxback12g.mail.yandex.net (mxback12g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:91]) by forward106o.mail.yandex.net (Yandex) with ESMTP id 9F6F67847CA for ; Tue, 5 Sep 2017 23:00:19 +0300 (MSK) Received: from smtp2j.mail.yandex.net (smtp2j.mail.yandex.net [2a02:6b8:0:801::ac]) by mxback12g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id O0E18hoedS-0Jj4ZYSg; Tue, 05 Sep 2017 23:00:19 +0300 Received: by smtp2j.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id anlnl3rubP-0JiGPBOe; Tue, 05 Sep 2017 23:00:19 +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: Tue, 5 Sep 2017 23:00:00 +0300 Message-Id: <1504641607-4966-7-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504641607-4966-1-git-send-email-odpbot@yandex.ru> References: <1504641607-4966-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v3 6/13] 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 --- /** Email created from pull request 165 (lumag:improve-build-3) ** https://github.com/Linaro/odp/pull/165 ** Patch: https://github.com/Linaro/odp/pull/165.patch ** Base sha: 42184679185ce0c979e065349360167e3fce6ca0 ** Merge commit sha: 38d800e8e4b3c89a118426f28490b2e87091e127 **/ 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)