Switch exception class, seems to fail on some gcc versions.

[shibboleth/cpp-sp.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 46b65e8..7422c34 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,28 +3,19 @@ AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS = -I .
 
 EXTRA_DIST = \
-       schemas doc isapi_shib isapi_shib_gui \
+       isapi_shib \
        Shibboleth.dsw libtool.m4 acx_pthread.m4 acx_rpctest.m4 depcomp \
        config_win32.h posttest/posttest.dsp shibtest/shibtest.dsp \
-       shibboleth.spec.in shibboleth.spec
-
-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`
+       shibboleth.spec.in shibboleth.spec pkginfo.in pkginfo checkinstall
 
 WANT_SUBDIRS = @WANT_SUBDIRS@
 
 SUBDIRS = $(WANT_SUBDIRS)
 
-DIST_SUBDIRS = doc oncrpc shib schemas configs shib-target shar test \
-       apache siterefresh shib-mysql-ccache xmlproviders
+DIST_SUBDIRS = adfs doc oncrpc shib schemas configs shib-target shar test \
+       apache fastcgi siterefresh shib-mysql-ccache xmlproviders nsapi_shib selinux
 
-all-local: shibboleth.spec
+all-local: shibboleth.spec pkginfo
 
 shibboleth.spec: shibboleth.spec.in Makefile
        rm -f $@.tmp
@@ -32,4 +23,10 @@ shibboleth.spec: shibboleth.spec.in Makefile
            -e 's:@-VERSION-@:${VERSION}:'
        mv $@.tmp $@
 
-DISTCLEANFILES = shibboleth.spec
+pkginfo: pkginfo.in Makefile
+       rm -f $@.tmp
+       sed < $< > $@.tmp \
+           -e 's:@-VERSION-@:${VERSION}:'
+       mv $@.tmp $@
+
+DISTCLEANFILES = shibboleth.spec pkginfo