From a3f35b0e11bc03d99fa846edc756283778797414 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Thu, 2 Mar 2006 22:23:25 +0000
Subject: [PATCH] Unix build fixes

---
 Makefile.am                |  3 ++
 schemas/Makefile.am        | 61 +++++++++++++++++++++-------------------
 xmltoolingtest/Makefile.am | 69 +++++++++++++++++++++++-----------------------
 3 files changed, 71 insertions(+), 62 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d56ad40..09993b3 100644
--- 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
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -1,28 +1,33 @@
-## $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 = .cvsignore catalog.xml.in
+## $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
--- a/xmltoolingtest/Makefile.am
+++ b/xmltoolingtest/Makefile.am
@@ -1,34 +1,35 @@
-AUTOMAKE_OPTIONS = foreign
-
-if BUILD_UNITTEST
-bin_PROGRAMS = xmltoolingtest
-xmltoolingtest_CXXFLAGS = $(CXXFLAGS) $(CXXTESTFLAGS)
-bin_PROGRAMS = 
-endif
-
-xmltoolingtest_h = \
-	xmltoolingtest.h \
-	MarshallingTest.h \
-	UnknownText.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
+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
-- 
2.1.4