From 6ebcb67a473a229bc788dc759a36b40a820a97aa Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Sat, 12 May 2007 02:00:03 +0000
Subject: [PATCH] Clean up doc/schema makefiles.

---
 Makefile.am         | 37 ++++++++++++++++---------------------
 doc/Makefile.am     | 10 +++++++---
 schemas/Makefile.am | 16 +++++++++++-----
 3 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3de9c4e..94f7c83 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,36 +6,17 @@ include doxygen.am
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
-EXTRA_DIST = $(DX_CONFIG) \
-	doc \
-	schemas \
-	cpp-opensaml2.sln \
-	libtool.m4 \
-	doxygen.m4 \
-	acx_pthread.m4 \
-	depcomp \
-	config_win32.h \
-	opensaml.spec.in \
-	opensaml.spec \
-	pkginfo.in \
-	pkginfo \
-	checkinstall
-
-
 dist-hook:
 	rm -rf `find $(distdir)/samltest/data -name .svn`
-	rm -rf `find $(distdir)/schemas -name .svn`
-	rm -rf `find $(distdir)/schemas -name Makefile`
-	rm -rf `find $(distdir)/doc -name .svn`
-	rm -rf `find $(distdir)/doc -name Makefile`
 
 
-SUBDIRS = schemas saml samltest
+SUBDIRS = doc schemas saml samltest
 
 all-local: opensaml.spec pkginfo
 
 if DX_COND_doc
 all-local: doxygen-doc
+APIDOCS = doc/api
 endif
 
 install-data-hook:
@@ -54,4 +35,18 @@ pkginfo: pkginfo.in Makefile
 	    -e 's:@-VERSION-@:${VERSION}:'
 	mv $@.tmp $@
 
+EXTRA_DIST = $(DX_CONFIG) \
+	$(APIDOCS) \
+	cpp-opensaml2.sln \
+	libtool.m4 \
+	doxygen.m4 \
+	acx_pthread.m4 \
+	depcomp \
+	config_win32.h \
+	opensaml.spec.in \
+	opensaml.spec \
+	pkginfo.in \
+	pkginfo \
+	checkinstall
+
 DISTCLEANFILES = opensaml.spec pkginfo
diff --git a/doc/Makefile.am b/doc/Makefile.am
index a2f58c2..ae19099 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,8 +2,12 @@ AUTOMAKE_OPTIONS = foreign
 
 pkgdocdir = $(prefix)/doc/@PACKAGE@
 
-pkgdoc_DATA = \
+docfiles = \
 	LICENSE.txt \
 	NOTICE.txt \
-	LOG4CPP.LICENSE \
-	CURL.LICENSE
+	LOG4CPP.LICENSE
+
+pkgdoc_DATA = $(docfiles)
+
+EXTRA_DIST = $(docfiles)
+	
\ No newline at end of file
diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 7d7b583..fb7593d 100644
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -3,9 +3,7 @@ AUTOMAKE_OPTIONS = foreign
 
 pkgxmldir = $(datadir)/xml/@PACKAGE@
 
-pkgxml_DATA = saml20-catalog.xml \
-	saml10-catalog.xml \
-	saml11-catalog.xml \
+schemafiles = 
 	cs-sstc-schema-assertion-01.xsd \
 	cs-sstc-schema-protocol-01.xsd \
 	cs-sstc-schema-assertion-1.1.xsd \
@@ -47,6 +45,12 @@ pkgxml_DATA = saml20-catalog.xml \
 	sstc-saml-metadata-ext-query.xsd \
 	sstc-saml-protocol-ext-thirdparty.xsd
 
+pkgxml_DATA = \
+	saml20-catalog.xml \
+	saml10-catalog.xml \
+	saml11-catalog.xml \
+	$(schemafiles)
+
 #
 # Some of these need building
 #
@@ -66,11 +70,13 @@ saml10-catalog.xml: ${srcdir}/saml10-catalog.xml.in Makefile ${top_builddir}/con
 saml11-catalog.xml: ${srcdir}/saml11-catalog.xml.in Makefile ${top_builddir}/config.status
 	$(MAKE) do-build-file FILE=$@
 
-CLEANFILES = saml20-catalog.xml \
+CLEANFILES = \
+	saml20-catalog.xml \
 	saml10-catalog.xml \
 	saml11-catalog.xml
 
 EXTRA_DIST = \
 	saml20-catalog.xml.in \
 	saml10-catalog.xml.in \
-	saml11-catalog.xml.in
+	saml11-catalog.xml.in \
+	$(schemafiles)
-- 
2.1.4