[cpp-xmltooling] 09/22: Don't install the test program, but link correctly and run it

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-xmltooling.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=a437d0aaa5ac986d1db1fd2e4ed77edbb95f23d9

commit a437d0aaa5ac986d1db1fd2e4ed77edbb95f23d9
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Wed Jul 6 16:51:20 2016 +0200

    Don't install the test program, but link correctly and run it
---
 xmltooling/Makefile.am     |  3 +--
 xmltoolingtest/Makefile.am | 17 ++++++++---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/xmltooling/Makefile.am b/xmltooling/Makefile.am
index 4d230a1..521dc8e 100644
--- a/xmltooling/Makefile.am
+++ b/xmltooling/Makefile.am
@@ -218,8 +218,7 @@ common_LIBADD   = $(xerces_LIBS)   $(log4shib_LIBS)   $(log4cpp_LIBS)   $(PTHREA
 
 libxmltooling_lite_la_SOURCES = \
 	${common_sources}
-libxmltooling_lite_la_CPPFLAGS = -DXMLTOOLING_LITE
-libxmltooling_lite_la_CXXFLAGS = $(common_CXXFLAGS)
+libxmltooling_lite_la_CXXFLAGS = -DXMLTOOLING_LITE $(common_CXXFLAGS)
 libxmltooling_lite_la_LDFLAGS = -version-info 8:0:0
 libxmltooling_lite_la_LIBADD = $(common_LIBADD)
 
diff --git a/xmltoolingtest/Makefile.am b/xmltoolingtest/Makefile.am
index c917f19..cfc0bf7 100644
--- a/xmltoolingtest/Makefile.am
+++ b/xmltoolingtest/Makefile.am
@@ -2,19 +2,18 @@ AUTOMAKE_OPTIONS = foreign
 
 if BUILD_UNITTEST
 
-bin_PROGRAMS = xmltoolingtest
-xmltoolingtest_CXXFLAGS = $(CXXTESTFLAGS)
+TESTS = xmltoolingtest
+
+check_PROGRAMS = xmltoolingtest
+
+xmltoolingtest_CXXFLAGS = $(CXXTESTFLAGS) $(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_CXXFLAGS += $(XMLSEC_CFLAGS)
+xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling.la $(XMLSEC_LIBS)
 else
 xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling-lite.la
 endif
-
-else
-
-bin_PROGRAMS = 
+xmltoolingtest_LDADD += $(xerces_LIBS)
 
 endif
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.