[xmltooling] 13/19: Test BUILD_UNITTEST in the main Makefile only

[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 c25e1bdc5c3d3153e577356fa58dd23156c63e3d
Author: Ferenc Wágner <wferi at niif.hu>
Date:   Wed Jul 6 17:26:12 2016 +0200

    Test BUILD_UNITTEST in the main Makefile only
---
 Makefile.am                | 6 +++++-
 xmltoolingtest/Makefile.am | 6 ------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6bcdb1b..be2f2bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,11 @@ include doxygen.am
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
-SUBDIRS = doc schemas @PACKAGE_NAME@ xmltoolingtest
+SUBDIRS = doc schemas @PACKAGE_NAME@
+
+if BUILD_UNITTEST
+SUBDIRS += xmltoolingtest
+endif
 
 if DX_COND_doc
 all-local: doxygen-doc
diff --git a/xmltoolingtest/Makefile.am b/xmltoolingtest/Makefile.am
index 7b58b5a..2927af1 100644
--- a/xmltoolingtest/Makefile.am
+++ b/xmltoolingtest/Makefile.am
@@ -1,7 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
 
-if BUILD_UNITTEST
-
 TESTS = xmltoolingtest
 
 check_PROGRAMS = xmltoolingtest
@@ -15,8 +13,6 @@ else
 xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling-lite.la $(xerces_LIBS)
 endif
 
-endif
-
 if BUILD_XMLSEC
 xmlsec_sources = \
     EncryptionTest.h \
@@ -49,10 +45,8 @@ noinst_HEADERS = \
 
 nodist_xmltoolingtest_SOURCES = $(xmltoolingtest_h:.h=.cpp)
 
-if BUILD_UNITTEST
 BUILT_SOURCES = $(nodist_xmltoolingtest_SOURCES)
 CLEANFILES = $(nodist_xmltoolingtest_SOURCES)
-endif
 
 do-cxxtestgen:
 	if test "$(CPPFILE)" = "xmltoolingtest.cpp"; then \

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