[API-NEXT,v1,6/19] build: drop platorm/linux-generic/Makefile.inc

Message ID 1505156408-13887-7-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • Untitled series #3957
Related show

Commit Message

Github ODP bot Sept. 11, 2017, 6:59 p.m.
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


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 <dmitry.ereminsolenikov@linaro.org>

Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org>

Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
/** 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

Patch

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