[cpp-xmltooling] 10/22: Test BUILD_UNITTEST in the main Makefile only

[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=d8bd27fb2ece41a651e65c1e00c2c8a517522916

commit d8bd27fb2ece41a651e65c1e00c2c8a517522916
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: 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 11e08e3..8be5fd5 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 cfc0bf7..6515c82 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 @@ xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling-lite.la
 endif
 xmltoolingtest_LDADD += $(xerces_LIBS)
 
-endif
-
 if BUILD_XMLSEC
 xmlsec_sources = \
 	DataSealerTest.h \
@@ -52,10 +48,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 \

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