[cpp-opensaml] 11/19: Check BUILD_UNITTEST in the main Makefile.am

[Scott Cantor]

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

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

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

commit 2a6eef2e1b2d3a52f3cd1b20588133ebb18ec6b5
Author: Ferenc Wágner <wferi at niif.hu>
AuthorDate: Tue Jul 12 11:02:53 2016 +0200

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

diff --git a/Makefile.am b/Makefile.am
index 801f48e..95ef69e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,11 @@ include doxygen.am
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
-SUBDIRS = doc schemas saml samltest samlsign
+SUBDIRS = doc schemas saml samlsign
+
+if BUILD_UNITTEST
+SUBDIRS += samltest
+endif
 
 if DX_COND_doc
 all-local: doxygen-doc
diff --git a/samltest/Makefile.am b/samltest/Makefile.am
index 6aa7418..2b8120f 100644
--- a/samltest/Makefile.am
+++ b/samltest/Makefile.am
@@ -1,11 +1,7 @@
 AUTOMAKE_OPTIONS = foreign subdir-objects
 
-if BUILD_UNITTEST
 bin_PROGRAMS = samltest
 samltest_CXXFLAGS = $(CXXFLAGS) $(CXXTESTFLAGS)
-else
-bin_PROGRAMS = 
-endif
 
 samltest_h = \
     samltest.h \
@@ -106,10 +102,8 @@ noinst_HEADERS = \
 
 nodist_samltest_SOURCES = $(samltest_h:.h=.cpp)
 
-if BUILD_UNITTEST
 BUILT_SOURCES = $(nodist_samltest_SOURCES)
 CLEANFILES = $(nodist_samltest_SOURCES)
-endif
 
 do-cxxtestgen:
 	if test "$(CPPFILE)" = "samltest.cpp"; then \

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