Unix build fixes

[shibboleth/cpp-xmltooling.git] / xmltoolingtest / Makefile.am

diff --git a/xmltoolingtest/Makefile.am b/xmltoolingtest/Makefile.am
index 041b563..1718841 100644 (file)
--- a/xmltoolingtest/Makefile.am
+++ b/xmltoolingtest/Makefile.am
@@ -1,34 +1,35 @@
-AUTOMAKE_OPTIONS = foreign\r
-\r
-if BUILD_UNITTEST\r
-bin_PROGRAMS = xmltoolingtest\r
-xmltoolingtest_CXXFLAGS = $(CXXFLAGS) $(CXXTESTFLAGS)\r
-bin_PROGRAMS = \r
-endif\r
-\r
-xmltoolingtest_h = \\r
-       xmltoolingtest.h \\r
-       MarshallingTest.h \\r
-       UnknownText.h \\r
-       UnmarshallingTest.h\r
-\r
-noinst_HEADERS = \\r
-       XMLObjectBaseTestCase.h\r
-\r
-nodist_xmltoolingtest_SOURCES = $(xmltoolingtest_h:.h=.cpp)\r
-\r
-CLEANFILES = $(nodist_xmltoolingtest_SOURCES)\r
-\r
-do-cxxtestgen:\r
-       if test $(HFILE) = "xmltoolingtest.h"; then \\r
-               $(CXXTEST) --error-printer --have-eh --have-std --abort-on-fail -o $(CPPFILE) $(HFILE); \\r
-       else \\r
-               $(CXXTEST) --part --have-eh --have-std --abort-on-fail -o $(CPPFILE) $(HFILE); \\r
-       fi;\r
-\r
-$(nodist_xmltoolingtest_SOURCES): %.cpp: %.h\r
-       $(MAKE) do-cxxtestgen HFILE=$< CPPFILE=$@\r
-\r
-xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling.la\r
-\r
-EXTRA_DIST = xmltoolingtest.vcproj $(xmltoolingtest_h) data\r
+AUTOMAKE_OPTIONS = foreign
+
+if BUILD_UNITTEST
+bin_PROGRAMS = xmltoolingtest
+xmltoolingtest_CXXFLAGS = $(CXXFLAGS) $(CXXTESTFLAGS)
+else
+bin_PROGRAMS = 
+endif
+
+xmltoolingtest_h = \
+       xmltoolingtest.h \
+       MarshallingTest.h \
+       UnknownTest.h \
+       UnmarshallingTest.h
+
+noinst_HEADERS = \
+       XMLObjectBaseTestCase.h
+
+nodist_xmltoolingtest_SOURCES = $(xmltoolingtest_h:.h=.cpp)
+
+CLEANFILES = $(nodist_xmltoolingtest_SOURCES)
+
+do-cxxtestgen:
+       if test $(HFILE) = "xmltoolingtest.h"; then \
+               $(CXXTEST) --error-printer --have-eh --have-std --abort-on-fail -o $(CPPFILE) $(HFILE); \
+       else \
+               $(CXXTEST) --part --have-eh --have-std --abort-on-fail -o $(CPPFILE) $(HFILE); \
+       fi;
+
+$(nodist_xmltoolingtest_SOURCES): %.cpp: %.h
+       $(MAKE) do-cxxtestgen HFILE=$< CPPFILE=$@
+
+xmltoolingtest_LDADD = $(top_builddir)/xmltooling/libxmltooling.la
+
+EXTRA_DIST = xmltoolingtest.vcproj $(xmltoolingtest_h) data