Clean up doc/schema makefiles.

diff --git a/Makefile.am b/Makefile.am
index 3de9c4e..94f7c83 100644 (file)
--- 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 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -2,8 +2,12 @@ AUTOMAKE_OPTIONS = foreign
 \r
 pkgdocdir = $(prefix)/doc/@PACKAGE@\r
 \r
-pkgdoc_DATA = \\r
+docfiles = \\r
        LICENSE.txt \\r
        NOTICE.txt \\r
-       LOG4CPP.LICENSE \\r
-       CURL.LICENSE\r
+       LOG4CPP.LICENSE\r
+\r
+pkgdoc_DATA = $(docfiles)\r
+\r
+EXTRA_DIST = $(docfiles)\r
+       
\ No newline at end of file

diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 7d7b583..fb7593d 100644 (file)
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -3,9 +3,7 @@ AUTOMAKE_OPTIONS = foreign
 \r
 pkgxmldir = $(datadir)/xml/@PACKAGE@\r
 \r
-pkgxml_DATA = saml20-catalog.xml \\r
-       saml10-catalog.xml \\r
-       saml11-catalog.xml \\r
+schemafiles = \r
        cs-sstc-schema-assertion-01.xsd \\r
        cs-sstc-schema-protocol-01.xsd \\r
        cs-sstc-schema-assertion-1.1.xsd \\r
@@ -47,6 +45,12 @@ pkgxml_DATA = saml20-catalog.xml \
        sstc-saml-metadata-ext-query.xsd \\r
        sstc-saml-protocol-ext-thirdparty.xsd\r
 \r
+pkgxml_DATA = \\r
+       saml20-catalog.xml \\r
+       saml10-catalog.xml \\r
+       saml11-catalog.xml \\r
+       $(schemafiles)\r
+\r
 #\r
 # Some of these need building\r
 #\r
@@ -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\r
        $(MAKE) do-build-file FILE=$@\r
 \r
-CLEANFILES = saml20-catalog.xml \\r
+CLEANFILES = \\r
+       saml20-catalog.xml \\r
        saml10-catalog.xml \\r
        saml11-catalog.xml\r
 \r
 EXTRA_DIST = \\r
        saml20-catalog.xml.in \\r
        saml10-catalog.xml.in \\r
-       saml11-catalog.xml.in\r
+       saml11-catalog.xml.in \\r
+       $(schemafiles)\r