CPPOST-91 - BOOST autoconf macros break with gcc5

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

diff --git a/Makefile.am b/Makefile.am
index 84148a0..2a2d014 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,15 @@
-AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+AUTOMAKE_OPTIONS = foreign dist-zip dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
 
 include doxygen.am
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
-dist-hook:
-       rm -rf `find $(distdir)/samltest/data -name .svn`
-       rm -rf `find $(distdir)/doc/api -name .svn`
-
+DISTCLEANFILES = \
+       @PACKAGE_NAME@.pc \
+       @PACKAGE_NAME@.pc.in \
+       @PACKAGE_NAME@-uninstalled.pc \
+       @PACKAGE_NAME@-uninstalled.sh
 
 SUBDIRS = doc schemas saml samltest samlsign
 
@@ -19,16 +19,13 @@ else
 all-local:
 endif
 
-GENFILES = opensaml.spec pkginfo Portfile
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = @PACKAGE_NAME@.pc
+
+GENFILES = @PACKAGE_NAME@.spec
 
 EXTRA_DIST = $(DX_CONFIG) \
        cpp-opensaml2.sln \
-       libtool.m4 \
-       doxygen.m4 \
-       acx_pthread.m4 \
-       depcomp \
        config_win32.h \
        $(GENFILES) \
-       $(GENFILES:%=%.in) \
-       depend \
-       postinstall
+       $(GENFILES:%=%.in)