Reduce special handling of doc/schemas for install/dist targets

diff --git a/Makefile.am b/Makefile.am
index 75753e8..181d777 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-xmltooling.sln \
-       acx_pthread.m4 \
-       acinclude.m4 \
-       libtool.m4 \
-       doxygen.m4 \
-       depcomp \
-       config_win32.h \
-       xmltooling.spec.in \
-       xmltooling.spec \
-       pkginfo.in \
-       pkginfo \
-       checkinstall
-
 dist-hook:
        rm -rf `find $(distdir)/xmltoolingtest/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 xmltooling xmltoolingtest
+SUBDIRS = doc schemas xmltooling xmltoolingtest
 
 all-local: xmltooling.spec pkginfo
 
 if DX_COND_doc
 all-local: doxygen-doc
+APIDOCS = doc/api
 endif
 
 install-data-hook:
@@ -54,4 +35,19 @@ pkginfo: pkginfo.in Makefile
            -e 's:@-VERSION-@:${VERSION}:'
        mv $@.tmp $@
 
+EXTRA_DIST = $(DX_CONFIG) \
+        $(APIDOCS) \
+        cpp-xmltooling.sln \
+        acx_pthread.m4 \
+        acinclude.m4 \
+        libtool.m4 \
+        doxygen.m4 \
+        depcomp \
+        config_win32.h \
+        xmltooling.spec.in \
+        xmltooling.spec \
+        pkginfo.in \
+        pkginfo \
+        checkinstall
+
 DISTCLEANFILES = xmltooling.spec pkginfo

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 42bec95..bafa6e2 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,10 +1,15 @@
-AUTOMAKE_OPTIONS = foreign\r
-\r
-pkgdocdir = $(prefix)/doc/@PACKAGE@\r
-\r
-pkgdoc_DATA = \\r
-       LICENSE.txt \\r
-       NOTICE.txt \\r
-       OPENSSL.LICENSE \\r
-       LOG4CPP.LICENSE \\r
-       CURL.LICENSE\r
+AUTOMAKE_OPTIONS = foreign
+
+pkgdocdir = $(prefix)/doc/@PACKAGE@
+
+docfiles = \
+       LICENSE.txt \
+       NOTICE.txt \
+       OPENSSL.LICENSE \
+       LOG4CPP.LICENSE \
+       CURL.LICENSE
+
+pkgdoc_DATA = $(docfiles)
+
+EXTRA_DIST = $(docfiles)
+

diff --git a/schemas/Makefile.am b/schemas/Makefile.am
index 2d44334..f5e877c 100644 (file)
--- a/schemas/Makefile.am
+++ b/schemas/Makefile.am
@@ -2,14 +2,17 @@
 
 AUTOMAKE_OPTIONS = foreign
 
+schemafiles = \
+       xenc-schema.xsd \
+        xmldsig-core-schema.xsd \
+        xml.xsd \
+        xmltooling.xsd
+
 pkgxmldir = $(datadir)/xml/@PACKAGE@
 
 pkgxml_DATA = \
        catalog.xml \
-       xenc-schema.xsd \
-       xmldsig-core-schema.xsd \
-       xml.xsd \
-       xmltooling.xsd
+       $(schemafiles)
 
 #
 # Some of these need building
@@ -26,4 +29,5 @@ catalog.xml: ${srcdir}/catalog.xml.in Makefile ${top_builddir}/config.status
 
 CLEANFILES = catalog.xml
 
-EXTRA_DIST = catalog.xml.in
+EXTRA_DIST = catalog.xml.in \
+       $(schemafiles)