[xmltooling] 12/19: Don't install the test program, but link correctly and run it

[Ferenc Wágner]

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

wferi-guest pushed a commit to branch patch-queue/debian/experimental
in repository xmltooling.

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

    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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-shibboleth/xmltooling.git