From 20aaea485ec31da5deaacb160ca246a247b88867 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Sat, 12 May 2007 02:15:46 +0000 Subject: [PATCH] Reduce special handling of doc/schemas for install/dist targets --- doc/Makefile.am | 24 ++++---- saml/Makefile.am | 2 +- schemas/Makefile.am | 164 ++++++++++++++++++++++++++-------------------------- 3 files changed, 95 insertions(+), 95 deletions(-) diff --git a/doc/Makefile.am b/doc/Makefile.am index ae19099..1baaa89 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,13 +1,13 @@ -AUTOMAKE_OPTIONS = foreign - -pkgdocdir = $(prefix)/doc/@PACKAGE@ - -docfiles = \ - LICENSE.txt \ - NOTICE.txt \ - LOG4CPP.LICENSE - -pkgdoc_DATA = $(docfiles) - -EXTRA_DIST = $(docfiles) +AUTOMAKE_OPTIONS = foreign + +pkgdocdir = $(prefix)/doc/@PACKAGE@ + +docfiles = \ + LICENSE.txt \ + NOTICE.txt \ + LOG4CPP.LICENSE + +pkgdoc_DATA = $(docfiles) + +EXTRA_DIST = $(docfiles) \ No newline at end of file diff --git a/saml/Makefile.am b/saml/Makefile.am index c2ce0a6..a922c78 100644 --- a/saml/Makefile.am +++ b/saml/Makefile.am @@ -178,4 +178,4 @@ install-exec-hook: EXTRA_DIST = saml.vcproj zlib dist-hook: - rm -rf `find $(distdir)/saml/zlib -name .svn` + rm -rf `find $(distdir)/zlib -name .svn` diff --git a/schemas/Makefile.am b/schemas/Makefile.am index fb7593d..e32e857 100644 --- a/schemas/Makefile.am +++ b/schemas/Makefile.am @@ -1,82 +1,82 @@ - -AUTOMAKE_OPTIONS = foreign - -pkgxmldir = $(datadir)/xml/@PACKAGE@ - -schemafiles = - cs-sstc-schema-assertion-01.xsd \ - cs-sstc-schema-protocol-01.xsd \ - cs-sstc-schema-assertion-1.1.xsd \ - cs-sstc-schema-protocol-1.1.xsd \ - saml-schema-assertion-2.0.xsd \ - saml-schema-authn-context-2.0.xsd \ - saml-schema-authn-context-auth-telephony-2.0.xsd \ - saml-schema-authn-context-ip-2.0.xsd \ - saml-schema-authn-context-ippword-2.0.xsd \ - saml-schema-authn-context-kerberos-2.0.xsd \ - saml-schema-authn-context-mobileonefactor-reg-2.0.xsd \ - saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd \ - saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd \ - saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd \ - saml-schema-authn-context-nomad-telephony-2.0.xsd \ - saml-schema-authn-context-personal-telephony-2.0.xsd \ - saml-schema-authn-context-pgp-2.0.xsd \ - saml-schema-authn-context-ppt-2.0.xsd \ - saml-schema-authn-context-pword-2.0.xsd \ - saml-schema-authn-context-session-2.0.xsd \ - saml-schema-authn-context-smartcard-2.0.xsd \ - saml-schema-authn-context-smartcardpki-2.0.xsd \ - saml-schema-authn-context-softwarepki-2.0.xsd \ - saml-schema-authn-context-spki-2.0.xsd \ - saml-schema-authn-context-srp-2.0.xsd \ - saml-schema-authn-context-sslcert-2.0.xsd \ - saml-schema-authn-context-telephony-2.0.xsd \ - saml-schema-authn-context-timesync-2.0.xsd \ - saml-schema-authn-context-types-2.0.xsd \ - saml-schema-authn-context-x509-2.0.xsd \ - saml-schema-authn-context-xmldsig-2.0.xsd \ - saml-schema-dce-2.0.xsd \ - saml-schema-ecp-2.0.xsd \ - saml-schema-metadata-2.0.xsd \ - saml-schema-protocol-2.0.xsd \ - saml-schema-x500-2.0.xsd \ - saml-schema-xacml-2.0.xsd \ - sstc-saml1x-metadata.xsd \ - 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 -# -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 - -saml20-catalog.xml: ${srcdir}/saml20-catalog.xml.in Makefile ${top_builddir}/config.status - $(MAKE) do-build-file FILE=$@ - -saml10-catalog.xml: ${srcdir}/saml10-catalog.xml.in Makefile ${top_builddir}/config.status - $(MAKE) do-build-file FILE=$@ - -saml11-catalog.xml: ${srcdir}/saml11-catalog.xml.in Makefile ${top_builddir}/config.status - $(MAKE) do-build-file FILE=$@ - -CLEANFILES = \ - saml20-catalog.xml \ - saml10-catalog.xml \ - saml11-catalog.xml - -EXTRA_DIST = \ - saml20-catalog.xml.in \ - saml10-catalog.xml.in \ - saml11-catalog.xml.in \ - $(schemafiles) + +AUTOMAKE_OPTIONS = foreign + +pkgxmldir = $(datadir)/xml/@PACKAGE@ + +schemafiles = \ + cs-sstc-schema-assertion-01.xsd \ + cs-sstc-schema-protocol-01.xsd \ + cs-sstc-schema-assertion-1.1.xsd \ + cs-sstc-schema-protocol-1.1.xsd \ + saml-schema-assertion-2.0.xsd \ + saml-schema-authn-context-2.0.xsd \ + saml-schema-authn-context-auth-telephony-2.0.xsd \ + saml-schema-authn-context-ip-2.0.xsd \ + saml-schema-authn-context-ippword-2.0.xsd \ + saml-schema-authn-context-kerberos-2.0.xsd \ + saml-schema-authn-context-mobileonefactor-reg-2.0.xsd \ + saml-schema-authn-context-mobileonefactor-unreg-2.0.xsd \ + saml-schema-authn-context-mobiletwofactor-reg-2.0.xsd \ + saml-schema-authn-context-mobiletwofactor-unreg-2.0.xsd \ + saml-schema-authn-context-nomad-telephony-2.0.xsd \ + saml-schema-authn-context-personal-telephony-2.0.xsd \ + saml-schema-authn-context-pgp-2.0.xsd \ + saml-schema-authn-context-ppt-2.0.xsd \ + saml-schema-authn-context-pword-2.0.xsd \ + saml-schema-authn-context-session-2.0.xsd \ + saml-schema-authn-context-smartcard-2.0.xsd \ + saml-schema-authn-context-smartcardpki-2.0.xsd \ + saml-schema-authn-context-softwarepki-2.0.xsd \ + saml-schema-authn-context-spki-2.0.xsd \ + saml-schema-authn-context-srp-2.0.xsd \ + saml-schema-authn-context-sslcert-2.0.xsd \ + saml-schema-authn-context-telephony-2.0.xsd \ + saml-schema-authn-context-timesync-2.0.xsd \ + saml-schema-authn-context-types-2.0.xsd \ + saml-schema-authn-context-x509-2.0.xsd \ + saml-schema-authn-context-xmldsig-2.0.xsd \ + saml-schema-dce-2.0.xsd \ + saml-schema-ecp-2.0.xsd \ + saml-schema-metadata-2.0.xsd \ + saml-schema-protocol-2.0.xsd \ + saml-schema-x500-2.0.xsd \ + saml-schema-xacml-2.0.xsd \ + sstc-saml1x-metadata.xsd \ + 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 +# +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 + +saml20-catalog.xml: ${srcdir}/saml20-catalog.xml.in Makefile ${top_builddir}/config.status + $(MAKE) do-build-file FILE=$@ + +saml10-catalog.xml: ${srcdir}/saml10-catalog.xml.in Makefile ${top_builddir}/config.status + $(MAKE) do-build-file FILE=$@ + +saml11-catalog.xml: ${srcdir}/saml11-catalog.xml.in Makefile ${top_builddir}/config.status + $(MAKE) do-build-file FILE=$@ + +CLEANFILES = \ + saml20-catalog.xml \ + saml10-catalog.xml \ + saml11-catalog.xml + +EXTRA_DIST = \ + saml20-catalog.xml.in \ + saml10-catalog.xml.in \ + saml11-catalog.xml.in \ + $(schemafiles) -- 2.1.4