[API-NEXT,v2,2/3] validation: drop obsolete Makefile.inc

Message ID 1514372409-29331-3-git-send-email-odpbot@yandex.ru
State New
Headers show
Series
  • Several small fixes
Related show

Commit Message

Github ODP bot Dec. 27, 2017, 11 a.m.
From: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>


This make include file was removed long ago but got resurrected in one
of merges with master branch.

Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsolenikov@linaro.org>

---
/** Email created from pull request 369 (lumag:api-next-fixes)
 ** https://github.com/Linaro/odp/pull/369
 ** Patch: https://github.com/Linaro/odp/pull/369.patch
 ** Base sha: a5f07dbf95f982b7c5898434e56164ff976c0a0f
 ** Merge commit sha: b9298b6e4d26f720f422ca57f1ea911597c955ef
 **/
 test/validation/Makefile.inc     | 10 ----------
 test/validation/api/Makefile.inc |  9 ++++++++-
 2 files changed, 8 insertions(+), 11 deletions(-)
 delete mode 100644 test/validation/Makefile.inc

Patch

diff --git a/test/validation/Makefile.inc b/test/validation/Makefile.inc
deleted file mode 100644
index 4f946b8af..000000000
--- a/test/validation/Makefile.inc
+++ /dev/null
@@ -1,10 +0,0 @@ 
-include $(top_srcdir)/test/Makefile.inc
-
-COMMON_DIR = $(top_builddir)/test/common
-
-AM_CFLAGS += -I$(top_srcdir)/test/common
-
-LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la
-LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la
-LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la
-LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la
diff --git a/test/validation/api/Makefile.inc b/test/validation/api/Makefile.inc
index 2a9ec2552..4af010002 100644
--- a/test/validation/api/Makefile.inc
+++ b/test/validation/api/Makefile.inc
@@ -1,6 +1,13 @@ 
-include $(top_srcdir)/test/validation/Makefile.inc
+include $(top_srcdir)/test/Makefile.inc
 
+COMMON_DIR = $(top_builddir)/test/common
+
+AM_CFLAGS += -I$(top_srcdir)/test/common
 AM_LDFLAGS += $(DPDK_PMDS)
 
 AM_CFLAGS += $(CUNIT_CFLAGS)
 
+LIBCUNIT_COMMON = $(COMMON_DIR)/libcunit_common.la
+LIBCPUMASK_COMMON = $(COMMON_DIR)/libcpumask_common.la
+LIBTHRMASK_COMMON = $(COMMON_DIR)/libthrmask_common.la
+LIBODP = $(LIB)/libodphelper.la $(LIB)/libodp-linux.la