From 5646d6e0504713328ad610dde751eaac074da353 Mon Sep 17 00:00:00 2001 From: Zoltan Kiss Date: Thu, 26 May 2016 18:38:03 +0100 Subject: Port ac9f523f "linux-generic: correctly set arch as undefined" Signed-off-by: Zoltan Kiss --- platform/linux-dpdk/Makefile.am | 6 +++--- platform/linux-dpdk/Makefile.inc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index c37e452b6..644beeca3 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -71,7 +71,7 @@ odpapiinclude_HEADERS = \ $(srcdir)/include/odp/api/timer.h \ $(srcdir)/include/odp/api/traffic_mngr.h \ $(srcdir)/include/odp/api/version.h \ - $(srcdir)/arch/@ARCH@/odp/api/cpu_arch.h + $(srcdir)/arch/@ARCH_DIR@/odp/api/cpu_arch.h odpapiplatincludedir= $(includedir)/odp/api/plat odpapiplatinclude_HEADERS = \ @@ -162,5 +162,5 @@ __LIB__libodp_dpdk_la_SOURCES = \ ../linux-generic/odp_traffic_mngr.c \ ../linux-generic/odp_version.c \ ../linux-generic/odp_weak.c \ - arch/@ARCH@/odp_cpu_arch.c \ - arch/@ARCH@/odp_sysinfo_parse.c + arch/@ARCH_DIR@/odp_cpu_arch.c \ + arch/@ARCH_DIR@/odp_sysinfo_parse.c diff --git a/platform/linux-dpdk/Makefile.inc b/platform/linux-dpdk/Makefile.inc index 1c5a99a66..45f7265e3 100644 --- a/platform/linux-dpdk/Makefile.inc +++ b/platform/linux-dpdk/Makefile.inc @@ -1,4 +1,4 @@ -AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH) -AM_CXXFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH) +AM_CFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) +AM_CXXFLAGS += -I$(top_srcdir)/platform/$(with_platform)/arch/$(ARCH_DIR) AM_LDFLAGS += -R$(SDK_INSTALL_PATH)/lib LOG_COMPILER = $(top_srcdir)/platform/linux-dpdk/test/wrapper-script.sh -- cgit v1.2.3