From patchwork Mon Sep 11 18:59:55 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: 112219 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp4212382qgf; Mon, 11 Sep 2017 12:08:06 -0700 (PDT) X-Google-Smtp-Source: AOwi7QC4rLWS8d53jujIJoN0nKJ/179Q24dLxUhUli7EkrKaoE0Wz3OlfIgndeYobpeS7SoZpBqM X-Received: by 10.237.36.146 with SMTP id t18mr9356498qtc.17.1505156886167; Mon, 11 Sep 2017 12:08:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505156886; cv=none; d=google.com; s=arc-20160816; b=dsSgppU/20N/VTaap0dIO8qOLs4mAvaAXfTS6QbsaZCZdlshZ4G52UUV5GboSdvCEN v6V/ng34q+zAQ1ibqoGFVzfVGEMza0wtTWxWHpfQIHVDBrQJZSHlqlP87UaGxJel9VR1 dyM+u9BhH3LZRd6W9rNHjyXUUxJ8WK75nrzes8BYR2gtnUilzSu5wlki+CrfGgvACybT IyxXF+k7/lfdd834zfIApuBff7ECdqYHtxRRYyc8u69LBSvY6HiN/7zKFKiGnj1kgrkT zHTII0N1Zf5UhNctUzxR+xwkCXzf8IdEKQnc+HXR7VIeR1yMFJDhcQZ3ec77TEMKxVqF n3pA== 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=vXNjJ+tdCJ3LCKjlB/agQGWHdqSX/UdIR2sf5kKazUk=; b=WRTwjMDGze5CsnbhtR0pO2sJ2zHmFkSDQzqA/vRl+mN+HKfjip0JscS4i1L5fTTHZd qVQwaC4fljrec+yss64qrzo/dbrEBE0D33FWKAdUID4SqOeg75xsEzOhPkuX17LHpzLI XdswWSUQ2KlWvjbXtPTJbTdCCyfgGMam/VbgN7dQBwaEMUzMA0DT/F1aD8+pSUfiIgPp 3J+AfqFO2iKx13eIvj6AIyLq3DnXfDdHRGpKM/UTr9hNpPdO8JeFgqzeltysS6M62qQg 4RgYVQKzTn6Qsag21fSHWxdH71lSE2nPrzSoZhI0lbscq9mX4NlenbyBd/FslggEri9/ NpwA== 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 j134si2789183qke.330.2017.09.11.12.08.02; Mon, 11 Sep 2017 12:08: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 13E2A61E64; Mon, 11 Sep 2017 19:08:02 +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 0AD9960665; Mon, 11 Sep 2017 19:01:21 +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 8EC4360F1D; Mon, 11 Sep 2017 19:00:35 +0000 (UTC) Received: from forward105j.mail.yandex.net (forward105j.mail.yandex.net [5.45.198.248]) by lists.linaro.org (Postfix) with ESMTPS id AAE68609EA for ; Mon, 11 Sep 2017 19:00:25 +0000 (UTC) Received: from mxback2g.mail.yandex.net (mxback2g.mail.yandex.net [IPv6:2a02:6b8:0:1472:2741:0:8b7:163]) by forward105j.mail.yandex.net (Yandex) with ESMTP id B087418327F for ; Mon, 11 Sep 2017 22:00:24 +0300 (MSK) Received: from smtp2p.mail.yandex.net (smtp2p.mail.yandex.net [2a02:6b8:0:1472:2741:0:8b6:7]) by mxback2g.mail.yandex.net (nwsmtp/Yandex) with ESMTP id 2pw8XpSjNw-0OVCHNX4; Mon, 11 Sep 2017 22:00:24 +0300 Received: by smtp2p.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id Xiwxkqm3eV-0Ol8soqu; 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:55 +0300 Message-Id: <1505156408-13887-7-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 6/19] 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 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 **/ 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