1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
|
From: =?utf-8?q?Ferenc_W=C3=A1gner?= <wferi@niif.hu>
Date: Wed, 6 Jul 2016 16:51:20 +0200
Subject: Don't install the test program, but link correctly and run it
---
xmltoolingtest/Makefile.am | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/xmltoolingtest/Makefile.am b/xmltoolingtest/Makefile.am
index 779e808..7b58b5a 100644
--- a/xmltoolingtest/Makefile.am
+++ b/xmltoolingtest/Makefile.am
@@ -2,20 +2,19 @@ AUTOMAKE_OPTIONS = foreign
if BUILD_UNITTEST
-bin_PROGRAMS = xmltoolingtest
+TESTS = xmltoolingtest
+
+check_PROGRAMS = xmltoolingtest
+
xmltoolingtest_CXXFLAGS = $(CXXTESTFLAGS)
+xmltoolingtest_CPPFLAGS = $(xerces_CFLAGS)
if BUILD_XMLSEC
-xmltoolingtest_CPPFLAGS = $(xerces_CFLAGS) $(XMLSEC_CFLAGS)
-xmltoolingtest_LDFLAGS = $(xerces_LIBS) $(XMLSEC_LIBS)
-xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling.la
+xmltoolingtest_CPPFLAGS += $(XMLSEC_CFLAGS)
+xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling.la $(XMLSEC_LIBS) $(xerces_LIBS)
else
-xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling-lite.la
+xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling-lite.la $(xerces_LIBS)
endif
-else
-
-bin_PROGRAMS =
-
endif
if BUILD_XMLSEC
|