Failed to initialize members after switch from auto_ptr.

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

diff --git a/Makefile.am b/Makefile.am
index 6d1536d..7422c34 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,66 +3,30 @@ 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 \
-    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
+       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 pkginfo.in pkginfo checkinstall
 
 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
+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 pkginfo
+
+shibboleth.spec: shibboleth.spec.in Makefile
+       rm -f $@.tmp
+       sed < $< > $@.tmp \
+           -e 's:@-VERSION-@:${VERSION}:'
+       mv $@.tmp $@
+
+pkginfo: pkginfo.in Makefile
+       rm -f $@.tmp
+       sed < $< > $@.tmp \
+           -e 's:@-VERSION-@:${VERSION}:'
+       mv $@.tmp $@
+
+DISTCLEANFILES = shibboleth.spec pkginfo