From patchwork Mon Sep 11 18:59:57 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: 112218 Delivered-To: patch@linaro.org Received: by 10.80.202.13 with SMTP id d13csp4968244edi; Mon, 11 Sep 2017 12:06:54 -0700 (PDT) X-Google-Smtp-Source: AOwi7QAf4IdO9y4TeC75l5YGypXl0Pa2bBpArtFO/YqRYtG1/BhNjIisQzf3GV9+ylgWS8P9fWMo X-Received: by 10.55.190.198 with SMTP id o189mr15711855qkf.103.1505156814140; Mon, 11 Sep 2017 12:06:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505156814; cv=none; d=google.com; s=arc-20160816; b=RH2sgT3g1GvdrTcuThipw7ST15cE5HS+UV9x6Oco4Hc3WVMR58uJ7uPN0QVqP/xRUN i35s7xwKdCWkFwtNBA9zvMMGFiX5tqsqYT9U2K7q4idInqRbU/gS+KZidzsq6zrQx5qn lEq7oycW9pAIb+D1q1UQ3ZLeGR1BL2EAG7jmzBwppAPP4cNp0BQjJU6FVoEZdUWijseO j4N2U9SHcxdYUufOsejY5iIsm8th06sBhQb7M0JQFQYtmALjXuAR/NVuvhdtrIDxIe+r 9QsKB/5ODKYOj+Ihk92bChuR72eklQkEZjtN/FqlY5KGT1e5/nulw4NfE//KwVhi2wXb nurA== 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=tmqumhAOYLHIejSuQclPCrg3cujnd+6JLtrSd0NEeNA=; b=fOkAqgSSJoiJ1CYBg7VIRL7ea3UByx3EjGylAUYH94yp0ZeEnXudM20AmHJgQ6GCVV SPxJaAB4/eeJq97p9d95d9Zxklr794ZYhC0I2SApFVTo4CDtIZ7RQA3tNQeIii/FIejv idp+9raEyXyQljGS2HG9rbckc1shyeMJhbGIS8bu/eKLzVex9GzGMytdDCRVwxSHERrE hmKkuHBD3C+ZPTlCJuT81UOPZqJsvHwdo8EB1woEW/MrwmGqEkZvkMqXgNu/h0/KdeiK /W6YbH5Of6r5CkM5P3PDRUtGyguli1ZcIurmdWOnieeRpZl0pbPLaMgwi2K2RZtJ4x0l Dhgw== 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 d77si11540863qkh.149.2017.09.11.12.06.53; Mon, 11 Sep 2017 12:06:54 -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 BA6DC61E19; Mon, 11 Sep 2017 19:06:53 +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, 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 B991562AE3; Mon, 11 Sep 2017 19:01:13 +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 5DE1460E19; Mon, 11 Sep 2017 19:00:33 +0000 (UTC) Received: from forward100p.mail.yandex.net (forward100p.mail.yandex.net [77.88.28.100]) by lists.linaro.org (Postfix) with ESMTPS id 494F260D92 for ; Mon, 11 Sep 2017 19:00:27 +0000 (UTC) Received: from mxback8o.mail.yandex.net (mxback8o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::22]) by forward100p.mail.yandex.net (Yandex) with ESMTP id E5F9D51031E3 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 mxback8o.mail.yandex.net (nwsmtp/Yandex) with ESMTP id PsIoKVY1BO-0PQSVBth; Mon, 11 Sep 2017 22:00:25 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Xiwxkqm3eV-0PluRk4d; Mon, 11 Sep 2017 22:00:25 +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:57 +0300 Message-Id: <1505156408-13887-9-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 8/19] configure: stop setting AM_* variables 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 AM_* variables by design should be set by Makefile.am, not by configure.ac. Use CFLAGS/CXXFLAGS instead. 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 **/ configure.ac | 12 +++--------- example/Makefile.inc | 4 ++-- helper/Makefile.am | 4 ++-- helper/test/Makefile.am | 4 ++-- platform/Makefile.inc | 4 ++-- platform/linux-generic/Makefile.am | 2 +- test/Makefile.inc | 4 ++-- test/linux-generic/Makefile.inc | 4 ++-- 8 files changed, 16 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac index f6f69942..d4c07a2c 100644 --- a/configure.ac +++ b/configure.ac @@ -329,6 +329,7 @@ ODP_CHECK_CFLAG([-Wformat-truncation=0]) ODP_CHECK_CFLAG([-Wformat-overflow=0]) ODP_CFLAGS="$ODP_CFLAGS -std=c99" +ODP_CXXFLAGS="$ODP_CXXFLAGS -std=c++11" # Extra flags for example to suppress certain warning types ODP_CFLAGS="$ODP_CFLAGS $ODP_CFLAGS_EXTRA" @@ -347,8 +348,8 @@ esac ########################################################################## # Default include setup ########################################################################## -AM_CFLAGS="$AM_CFLAGS $ODP_CFLAGS" -AM_CXXFLAGS="-std=c++11" +CFLAGS="$CFLAGS $ODP_CFLAGS" +CXXFLAGS="$CXXFLAGS $ODP_CXXFLAGS" AC_CONFIG_FILES([Makefile pkgconfig/libodp-linux.pc @@ -359,11 +360,8 @@ AC_CONFIG_FILES([Makefile # distribute the changed variables among the Makefiles AC_SUBST([LIBS]) -AC_SUBST([AM_CPPFLAGS]) AC_SUBST([CPPFLAGS]) -AC_SUBST([AM_CFLAGS]) AC_SUBST([CFLAGS]) -AC_SUBST([AM_LDFLAGS]) AC_SUBST([LDFLAGS]) AC_SUBST([EXEEXT]) @@ -390,12 +388,8 @@ AC_MSG_RESULT([ cc: ${CC} cc version: ${CC_VERSION} cppflags: ${CPPFLAGS} - am_cppflags: ${AM_CPPFLAGS} - am_cxxflags: ${AM_CXXFLAGS} cflags: ${CFLAGS} - am_cflags: ${AM_CFLAGS} ldflags: ${LDFLAGS} - am_ldflags: ${AM_LDFLAGS} libs: ${LIBS} defs: ${DEFS} static libraries: ${enable_static} diff --git a/example/Makefile.inc b/example/Makefile.inc index 7cc21154..cba385b7 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,6 +1,6 @@ LIB = $(top_builddir)/lib LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_PMDS) -AM_CFLAGS += \ +AM_CFLAGS = \ -I$(srcdir) \ -I$(top_srcdir)/example \ -I$(top_srcdir)/platform/@with_platform@/include \ @@ -11,4 +11,4 @@ AM_CFLAGS += \ -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include -AM_LDFLAGS += -L$(LIB) +AM_LDFLAGS = -L$(LIB) diff --git a/helper/Makefile.am b/helper/Makefile.am index fa503f1a..bf75b467 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -2,7 +2,7 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc LIB = $(top_builddir)/lib -AM_CPPFLAGS += -I$(srcdir)/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@ @@ -10,7 +10,7 @@ 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)' +AM_LDFLAGS = -version-number '$(ODPHELPER_LIBSO_VERSION)' helperincludedir = $(includedir)/odp/helper/ helperinclude_HEADERS = \ diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index fdc15f96..e30a1e71 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -17,8 +17,8 @@ INCFLAGS = \ ODP_PLATFORM=${with_platform} -AM_CPPFLAGS += $(INCFLAGS) -AM_LDFLAGS += -static +AM_CPPFLAGS = $(INCFLAGS) +AM_LDFLAGS = -static EXECUTABLES = chksum$(EXEEXT) \ cuckootable$(EXEEXT) \ diff --git a/platform/Makefile.inc b/platform/Makefile.inc index a88e8384..f6722560 100644 --- a/platform/Makefile.inc +++ b/platform/Makefile.inc @@ -8,9 +8,9 @@ pkgconfig_DATA = $(top_builddir)/pkgconfig/libodp-linux.pc VPATH = $(srcdir) $(builddir) lib_LTLIBRARIES = $(LIB)/libodp-linux.la -AM_LDFLAGS += -version-number '$(ODP_LIBSO_VERSION)' +AM_LDFLAGS = -version-number '$(ODP_LIBSO_VERSION)' -AM_CFLAGS += "-DGIT_HASH=$(VERSION)" +AM_CFLAGS = "-DGIT_HASH=$(VERSION)" AM_CFLAGS += $(VISIBILITY_CFLAGS) AM_CFLAGS += @PTHREAD_CFLAGS@ diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index e644505e..f5f65384 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/platform/Makefile.inc -AM_CPPFLAGS += -I$(srcdir)/include +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 diff --git a/test/Makefile.inc b/test/Makefile.inc index f5bb7674..8bd21432 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -16,9 +16,9 @@ INCFLAGS = \ -I$(top_builddir)/include AM_CPPFLAGS = $(INCFLAGS) -AM_CFLAGS += $(CUNIT_CFLAGS) +AM_CFLAGS = $(CUNIT_CFLAGS) -AM_LDFLAGS += -L$(LIB) +AM_LDFLAGS = -L$(LIB) @VALGRIND_CHECK_RULES@ valgrind_tools = memcheck diff --git a/test/linux-generic/Makefile.inc b/test/linux-generic/Makefile.inc index ff99fbc9..cfb61441 100644 --- a/test/linux-generic/Makefile.inc +++ b/test/linux-generic/Makefile.inc @@ -2,9 +2,9 @@ # build specific ODP applications, (i.e those whose do more than validation # test wrapping) -AM_LDFLAGS += -static +AM_LDFLAGS = -static -AM_CFLAGS += $(CUNIT_CFLAGS) +AM_CFLAGS = $(CUNIT_CFLAGS) LIBCUNIT_COMMON = $(top_builddir)/test/common_plat/common/libcunit_common.la LIB = $(top_builddir)/lib