Revised distribution inclusions.

diff --git a/Makefile.am b/Makefile.am
index 6d1536d..eef83e8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,66 +3,23 @@ AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
 EXTRA_DIST = \
-    schemas/cs-sstc-schema-assertion-01.xsd \
-    schemas/cs-sstc-schema-protocol-01.xsd \
-    schemas/cs-sstc-schema-assertion-1.1.xsd \
-    schemas/cs-sstc-schema-protocol-1.1.xsd \
-    schemas/soap-envelope.xsd \
-    schemas/xmldsig-core-schema.xsd \
-    schemas/xmldsig-filter2.xsd \
-    schemas/xml.xsd \
-    schemas/shibboleth.xsd \
-    configs/accessError.html \
-    configs/shar.logger \
-    configs/shireError.html \
-    configs/apache.config \
-    configs/shibboleth.ini \
-    configs/ca-bundle.crt \
-    configs/shibboleth.logger \
-    configs/rmError.html \
-    configs/shire.logger \
-    configs/AAP.xml \
-    doc/CREDITS.txt \
-    doc/INSTALL.txt \
-    doc/INSTALL-WIN32.txt \
-    doc/LICENSE.txt \
-    doc/NEWS.txt \
-    doc/README.txt \
-    doc/OPENSSL.LICENSE \
-    doc/LOG4CPP.LICENSE \
-    doc/CURL.LICENSE \
-    doc/InQueue.html \
-    doc/DEPLOY-GUIDE-ORIGIN.html \
-    doc/DEPLOY-GUIDE-TARGET.html \
-    Shibboleth.dsw \
-    isapi_shib/isapi_shib.dsp \
-    isapi_shib/isapi_shib.cpp \
-    isapi_shib/cgiparse.h \
-    isapi_shib/cgiparse.c \
-    mod_shibrm/mod_shibrm.dsp \
-    mod_shire/mod_shire.dsp \
-    oncrpc/oncrpc.def \
-    oncrpc/oncrpc.dsp \
-    oncrpc/oncrpc.rc \
-    oncrpc/resource.h \
+       schemas configs doc isapi_shib \
+       Shibboleth.dsw libtool.m4 acx_pthread.m4 acx_rpctest.m4 \
     posttest/posttest.dsp \
-    shar/shar.dsp \
-    shar/shar_win32.cpp \
-    shar/testclient.dsp \
-    shib/shib.dsp \
-    shib/shib-threads-win32.cpp \
-    shib-mysql-ccache/shib_mysql_ccache.dsp \
-    shib-target/shibtarget.dsp \
-    shibtest/shibtest.dsp \
-    siterefresh/siterefresh.dsp \
-    libtool.m4 \
-    acx_pthread.m4 \
-    acx_rpctest.m4
+    shibtest/shibtest.dsp
+
+dist-hook:
+       rm -rf `find $(distdir)/schemas -name CVS`
+       rm -rf `find $(distdir)/schemas -name Makefile`
+       rm -rf `find $(distdir)/configs -name CVS`
+       rm -rf `find $(distdir)/configs -name Makefile`
+       rm -rf `find $(distdir)/doc -name CVS`
+       rm -rf `find $(distdir)/doc -name Makefile`
+       rm -rf `find $(distdir)/isapi_shib -name CVS`
 
 WANT_SUBDIRS = @WANT_SUBDIRS@
 
 SUBDIRS = $(WANT_SUBDIRS)
 
 DIST_SUBDIRS = doc oncrpc shib schemas configs shib-target shar test \
-       mod_shire mod_shibrm siterefresh shib-mysql-ccache isapi_shib
-
+       mod_shire mod_shibrm siterefresh shib-mysql-ccache

diff --git a/shib-mysql-ccache/Makefile.am b/shib-mysql-ccache/Makefile.am
index 5cff5b3..a6897b5 100644 (file)
--- a/shib-mysql-ccache/Makefile.am
+++ b/shib-mysql-ccache/Makefile.am
@@ -16,3 +16,5 @@ libshib_mysql_ccache_la_SOURCES = \
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
 libshib_mysql_ccache_la_LDFLAGS = -version-info 1:0:0
+
+EXTRA_DIST = shib_mysql_ccache.dsp

diff --git a/shib-target/Makefile.am b/shib-target/Makefile.am
index 9c3fdc0..3b717f2 100644 (file)
--- a/shib-target/Makefile.am
+++ b/shib-target/Makefile.am
@@ -54,3 +54,5 @@ rpcgen:
 do_rpcgen:
        $(RM) $(RPCGEN_TARGET)
        $(RPCGEN) $(RPCGEN_ARGS) -o $(RPCGEN_TARGET) $(RPCGEN_SRC)
+
+EXTRA_DIST = shibtarget.dsp

diff --git a/siterefresh/Makefile.am b/siterefresh/Makefile.am
index 280ccd8..1c3d3b5 100644 (file)
--- a/siterefresh/Makefile.am
+++ b/siterefresh/Makefile.am
@@ -8,3 +8,5 @@ siterefresh_SOURCES = siterefresh.cpp
 
 siterefresh_LDADD = \
   $(top_builddir)/shib/libshib.la
+
+EXTRA_DIST = siterefresh.dsp