Unix build fixes

diff --git a/Makefile.am b/Makefile.am
index d56ad40..09993b3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,8 +11,11 @@ EXTRA_DIST =
        config_win32.h
 
 dist-hook:
+       rm -rf `find $(distdir)/xmltoolingtest/data -name .svn`
+       rm -rf `find $(distdir)/schemas -name .svn`
        rm -rf `find $(distdir)/schemas -name Makefile`
 
+
 SUBDIRS = schemas xmltooling xmltoolingtest
 
 #all-local: opensaml.spec pkginfo

diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index ebc1d31..6ffa021 100644 (file)
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,28 +1,33 @@
-## $Id:$ \r
-\r
-AUTOMAKE_OPTIONS = foreign\r
-\r
-pkgxmldir = $(datadir)/xml/@PACKAGE@\r
-\r
-pkgxml_DATA = \\r
-                               catalog.xml \\r
-                               xenc-schema.xsd \\r
-                xmldsig-core-schema.xsd \\r
-                xml.xsd\r
-\r
-#\r
-# Some of these need building\r
-#\r
-do-build-file:\r
-       rm -f ${FILE}.tmp\r
-       sed < ${srcdir}/${FILE}.in > ${FILE}.tmp \\r
-           -e 's:@-PKGXMLDIR-@:${pkgxmldir}:'\r
-       cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}\r
-       rm -f ${FILE}.tmp\r
-\r
-catalog.xml: ${srcdir}/catalog.xml.in Makefile ${top_builddir}/config.status\r
-       $(MAKE) do-build-file FILE=$@\r
-\r
-CLEANFILES = catalog.xml\r
-\r
-EXTRA_DIST = .cvsignore catalog.xml.in\r
+## $Id:$ 
+
+AUTOMAKE_OPTIONS = foreign
+
+pkgxmldir = $(datadir)/xml/@PACKAGE@
+
+pkgxml_DATA = \
+       catalog.xml \
+       xenc-schema.xsd \
+       xmldsig-core-schema.xsd \
+       xml.xsd
+
+#
+# Some of these need building
+#
+do-build-file:
+       rm -f ${FILE}.tmp
+       sed < ${srcdir}/${FILE}.in > ${FILE}.tmp \
+           -e 's:@-PKGXMLDIR-@:${pkgxmldir}:'
+       cmp -s ${FILE} ${FILE}.tmp || mv ${FILE}.tmp ${FILE}
+       rm -f ${FILE}.tmp
+
+catalog.xml: ${srcdir}/catalog.xml.in Makefile ${top_builddir}/config.status
+       $(MAKE) do-build-file FILE=$@
+
+CLEANFILES = catalog.xml
+
+EXTRA_DIST = \
+       catalog.xml.in \
+        xenc-schema.xsd \
+        xmldsig-core-schema.xsd \
+        xml.xsd
+

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