CPPOST-91 - BOOST autoconf macros break with gcc5

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

diff --git a/Makefile.am b/Makefile.am
index 836bb53..2a2d014 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign dist-zip dist-bzip2
 ACLOCAL_AMFLAGS = -I m4
 
 include doxygen.am
@@ -11,11 +11,6 @@ DISTCLEANFILES = \
        @PACKAGE_NAME@-uninstalled.pc \
        @PACKAGE_NAME@-uninstalled.sh
 
-dist-hook:
-       rm -rf `find $(distdir)/samltest/data -name .svn`
-       rm -rf `find $(distdir)/doc/api -name .svn`
-
-
 SUBDIRS = doc schemas saml samltest samlsign
 
 if DX_COND_doc
@@ -27,11 +22,10 @@ endif
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = @PACKAGE_NAME@.pc
 
-GENFILES = @PACKAGE_NAME@.spec pkginfo Portfile
+GENFILES = @PACKAGE_NAME@.spec
 
 EXTRA_DIST = $(DX_CONFIG) \
        cpp-opensaml2.sln \
        config_win32.h \
        $(GENFILES) \
-       $(GENFILES:%=%.in) \
-       postinstall
+       $(GENFILES:%=%.in)