From: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org>
Signed-off-by: Dmitry Eremin-Solenikov <dmitry.ereminsoleni...@linaro.org>
---
/** Email created from pull request 377 (lumag:misc-fixes)
** https://github.com/Linaro/odp/pull/377
** Patch: https://github.com/Linaro/odp/pull/377.patch
** Base sha: 49ebafae0edebbc750742d8874ad0a7588286dea
** Merge commit sha: 3c1b82834c36bc66d397aedd2f80da45160eae2d
**/
helper/test/Makefile.am | 24 +-----------------------
1 file changed, 1 insertion(+), 23 deletions(-)
diff --git a/helper/test/Makefile.am b/helper/test/Makefile.am
index 8eee643be..662d6c758 100644
--- a/helper/test/Makefile.am
+++ b/helper/test/Makefile.am
@@ -1,26 +1,4 @@
-TESTS_ENVIRONMENT = EXEEXT=${EXEEXT}
-
-LIB = $(top_builddir)/lib
-
-#in the following line, the libs using the symbols should come before
-#the libs containing them! The includer is given a chance to add things
-#before libodp by setting PRE_LDADD before the inclusion.
-LDADD = $(PRE_LDADD) $(LIB)/libodphelper.la $(LIB)/libodp-linux.la
-
-INCFLAGS = \
- -I$(top_builddir)/platform/@with_platform@/include \
- -I$(top_srcdir)/helper/include \
- -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
-
-ODP_PLATFORM=${with_platform}
-
-AM_CPPFLAGS = $(INCFLAGS)
-AM_LDFLAGS = -static
+include $(top_srcdir)/test/Makefile.inc
EXECUTABLES = chksum \
cuckootable \
