From patchwork Thu Sep 7 12: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: 111898 Delivered-To: patch@linaro.org Received: by 10.37.128.210 with SMTP id c18csp93390ybm; Thu, 7 Sep 2017 05:15:23 -0700 (PDT) X-Google-Smtp-Source: AOwi7QA0JdQMKhZ0aG2egkr2NIaXvamD2sl9IV0gz2CrNv3PQ5CdNALo3KtHuEodPE2W7yUSo5je X-Received: by 10.55.0.213 with SMTP id t82mr3563282qkg.286.1504786523498; Thu, 07 Sep 2017 05:15:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504786523; cv=none; d=google.com; s=arc-20160816; b=bKTw1lqDmCL2yZQGA+CtAzm0IlFYNhmMB8vTog3ylL9Vv+w+uef8C/FhdEL0ncSNmM 6Asd//YW/HSbg2Gd9fY8EnR5HA36ce7Rh8T8HABfU8LvgnUfdmLJXRHC8GRsk5zyI34Z nFJWGhgXKGP0HAb0fb4SD6ayZ8z7DJXjyJWbsp8bjGvBJMFibAtwwt3T7wmVkCLgArid R8K0v25NRkEQGBh9fMe97xCowHspZitbXmq3se1EXEQVkqeeNI+YOpgwamh7tkpQu/Rs R6g1ITsYldsz1u4v36MtUN+PW6e8KK9AQQ2fQYaSNGGZ3xldEJESsLoFN6cWmKA0TH59 EZ9A== 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=6XZA2y+fJonYxL+m0AHaTNcnEW9d86HyIm7QUquGN88=; b=pkQyeOY3ymbG4gd6PhVkuKnRcAZKmJp7xYs7EuRuEBt652pV/1NO8B9adm0RUXPU9e c0zwqSvbiYQtqj6zxD6hWjATVeewLQld6ZHLWxeiOhOjy+Hkz4DnooukIfUoj/CFSwmY 9wfSw7wdo5mskL6pri0bDBaZU+fLkXxQmeIzIhgR4SvFdYehrCW9ex+2WaCnwvfYvFbt GRWtQYb48NivEXSeJ9V3MLU5Kd14vGwEi4qWOdDvWmQBQ5M93JEpgp0lz2V2YnNXWdMX Aq6gZlKI53dxRvqoKffNYl2PeWrHc77B6ZEegJNvC+F2uEH5x6VLPKNC6aN1bIJbnVtf Om+g== 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 w128si2567494qkd.32.2017.09.07.05.15.21; Thu, 07 Sep 2017 05:15:23 -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 A860764FD5; Thu, 7 Sep 2017 12:15:21 +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 27442644E3; Thu, 7 Sep 2017 12:06:54 +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 748E76081A; Thu, 7 Sep 2017 12:06:15 +0000 (UTC) Received: from forward104o.mail.yandex.net (forward104o.mail.yandex.net [37.140.190.179]) by lists.linaro.org (Postfix) with ESMTPS id 31184644E6 for ; Thu, 7 Sep 2017 12:00:31 +0000 (UTC) Received: from mxback14j.mail.yandex.net (mxback14j.mail.yandex.net [IPv6:2a02:6b8:0:1619::90]) by forward104o.mail.yandex.net (Yandex) with ESMTP id 0ED4D2C85F43 for ; Thu, 7 Sep 2017 15:00:29 +0300 (MSK) Received: from smtp1o.mail.yandex.net (smtp1o.mail.yandex.net [2a02:6b8:0:1a2d::25]) by mxback14j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id C3ijTexJHb-0SW8CkJF; Thu, 07 Sep 2017 15:00:29 +0300 Received: by smtp1o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id OSCKROY85q-0SdS0SKF; Thu, 07 Sep 2017 15:00:28 +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: Thu, 7 Sep 2017 15:00:00 +0300 Message-Id: <1504785609-27545-6-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> References: <1504785609-27545-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 165 Subject: [lng-odp] [PATCH v4 5/14] 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: 360c1d34b52a2356619b9290811862b9de41de00 ** Merge commit sha: b3c5b66f989f86f62c8d44471480599b93cac6c0 **/ 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