From patchwork Tue Sep 5 19:00:01 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: 111714 Delivered-To: patch@linaro.org Received: by 10.140.94.166 with SMTP id g35csp3239157qge; Tue, 5 Sep 2017 12:05:49 -0700 (PDT) X-Google-Smtp-Source: ADKCNb7zTXyIeOdII46kLI1xZIPTwSS5ieAOZOMSpMkJ8AZYZ00Ws2WJ8uVya4xYUP5sYaXGfMlG X-Received: by 10.55.19.136 with SMTP id 8mr154532qkt.144.1504638348931; Tue, 05 Sep 2017 12:05:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504638348; cv=none; d=google.com; s=arc-20160816; b=bWjaoFIC+zCBryTmVIjXGcHnKCHAyEp5pgL2vKKHaG4MfmLI5jSqlfwjp0JZa5m7+X b2ozulCugNPdQvFyX3ubiT+e2QhXBNpurD1BIaDdurnaS7iiS9udovUXhwUQDYYr/jSc Myi1cFpwWfLLha7lEZtWFIQYEzCaDtgmSwR1v6OeatEmFchN2uIiiK9lWK1Zmd/HjsAX cJ8o0IG6jDQGd6g7rfKMP4yvopYG0+4+UbKzyarNjKswtTu9NprYo8Vv7dZn7vlsrSeC sQ/b8ju4fEWiKe5l3wa8bBeGfmtQ3kW9M73zVg95FraBYNNuVe9qv7cfYmKYRHFvprMK steQ== 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=6oHMX5BgFNHIUgdI8PkBDohUouhicV2rotS819v9akg=; b=yY4NX9QJvmhfiFGox+3YRcgxAUTrpCfcpnynjB/wgxL1YBxJkh3mYJ1I90BzRSWYfN 9QKNMN+18fiwjJdrO2Yd5Z9IRbEqUqY7ib93MgY8hDF9XqgZ57a03DQ0y05rv/L1hxIx aORIMQx5JXPC6CdDQQGFprpuSGAR0w7F645D+VsgUpUikuScpDxILQpFqK0mUTf5oqSs P0EXaZtJeTV47P535XsN5A8qznLKRC8owaEw9MidGo/OooEj1+l+rcZXmlQFwpZ7XtBQ ioG7jVcQPulz6Bs54T5qxbiafHd29pdmYEfc0f239mRHz3FFNijwy1Mc94SMTCx6jWLn UXnA== 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 z9si1076270qkf.101.2017.09.05.12.05.48; Tue, 05 Sep 2017 12:05:48 -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 8680062CE0; Tue, 5 Sep 2017 19:05:48 +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 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 5471461E19; Tue, 5 Sep 2017 19:00:59 +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 0089F60DB2; Tue, 5 Sep 2017 19:00:28 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id 5343160D8F for ; Tue, 5 Sep 2017 19:00:19 +0000 (UTC) Received: from mxback15g.mail.yandex.net (mxback15g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:94]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 0B6355D821DE for ; Tue, 5 Sep 2017 22:00:18 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback15g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 4L31gMirG2-0HduMoiv; Tue, 05 Sep 2017 22:00:18 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id k2pMwToQDC-0HE0P8OX; Tue, 05 Sep 2017 22:00:17 +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 22:00:01 +0300 Message-Id: <1504638007-2671-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> References: <1504638007-2671-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v1 5/11] build: drop platorm/linux-generic/Makefile.inc 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 Mandate that platform provides platform/$(with_platform)/arch/$(ARCH_DIR) directory and reference it directly from all Makefile.am/.inc files. Main reason for this change is to allow automake to process all includes at the time of Makefile.am -> Makefile.in conversion. Currently it can not determine path for platform/@with_platform@/Makefile.inc, thus inclusion is left for main make invocation. 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: c9bd3cdd91bd495988653511548fd4525579db79 **/ example/Makefile.inc | 2 +- helper/Makefile.am | 3 +-- helper/test/Makefile.am | 3 +-- platform/linux-generic/Makefile.am | 5 ++--- platform/linux-generic/Makefile.inc | 2 -- test/Makefile.inc | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) delete mode 100644 platform/linux-generic/Makefile.inc diff --git a/example/Makefile.inc b/example/Makefile.inc index c6d7ff5f..7cc21154 100644 --- a/example/Makefile.inc +++ b/example/Makefile.inc @@ -1,4 +1,3 @@ -include $(top_srcdir)/platform/@with_platform@/Makefile.inc LIB = $(top_builddir)/lib LDADD = $(LIB)/libodp-linux.la $(LIB)/libodphelper.la $(DPDK_PMDS) AM_CFLAGS += \ @@ -9,6 +8,7 @@ AM_CFLAGS += \ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ -I$(top_srcdir)/helper/include \ -I$(top_builddir)/platform/@with_platform@/include \ + -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include AM_LDFLAGS += -L$(LIB) diff --git a/helper/Makefile.am b/helper/Makefile.am index c69fd678..ca512ff1 100644 --- a/helper/Makefile.am +++ b/helper/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/platform/@with_platform@/Makefile.inc - pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = $(top_builddir)/pkgconfig/libodphelper.pc @@ -9,6 +7,7 @@ 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_LDFLAGS += -version-number '$(ODPHELPER_LIBSO_VERSION)' diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am index beef9191..00997f10 100644 --- a/helper/test/Makefile.am +++ b/helper/test/Makefile.am @@ -1,5 +1,3 @@ -include $(top_srcdir)/platform/@with_platform@/Makefile.inc - LIB = $(top_builddir)/lib #in the following line, the libs using the symbols should come before @@ -13,6 +11,7 @@ INCFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ -I$(top_srcdir)/platform/@with_platform@/include \ + -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_builddir)/include \ -I$(top_srcdir)/helper diff --git a/platform/linux-generic/Makefile.am b/platform/linux-generic/Makefile.am index 8f0618f4..eada421c 100644 --- a/platform/linux-generic/Makefile.am +++ b/platform/linux-generic/Makefile.am @@ -2,13 +2,13 @@ #export CUSTOM_STR=https://git.linaro.org/lng/odp.git include $(top_srcdir)/platform/Makefile.inc -include $(top_srcdir)/platform/@with_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 += $(OPENSSL_CPPFLAGS) AM_CPPFLAGS += $(DPDK_CPPFLAGS) @@ -170,8 +170,7 @@ noinst_HEADERS = \ ${srcdir}/include/protocols/ip.h \ ${srcdir}/include/protocols/ipsec.h \ ${srcdir}/include/protocols/tcp.h \ - ${srcdir}/include/protocols/udp.h \ - ${srcdir}/Makefile.inc + ${srcdir}/include/protocols/udp.h __LIB__libodp_linux_la_SOURCES = \ _fdserver.c \ diff --git a/platform/linux-generic/Makefile.inc b/platform/linux-generic/Makefile.inc deleted file mode 100644 index 876519be..00000000 --- a/platform/linux-generic/Makefile.inc +++ /dev/null @@ -1,2 +0,0 @@ -AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) -AM_CXXFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) diff --git a/test/Makefile.inc b/test/Makefile.inc index 728868df..d701ebd7 100644 --- a/test/Makefile.inc +++ b/test/Makefile.inc @@ -1,4 +1,3 @@ -include $(top_srcdir)/platform/@with_platform@/Makefile.inc LIB = $(top_builddir)/lib #in the following line, the libs using the symbols should come before @@ -12,6 +11,7 @@ INCFLAGS = \ -I$(top_srcdir)/include \ -I$(top_srcdir)/include/odp/arch/@ARCH_ABI@ \ -I$(top_srcdir)/platform/@with_platform@/include \ + -I$(top_srcdir)/platform/@with_platform@/arch/@ARCH_DIR@ \ -I$(top_srcdir)/test \ -I$(top_builddir)/include