X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=Makefile.am;h=2a2d0141e846ed2c9c1b43e3610a4b32d54ca9f2;hp=a0ff2d6ace3aa15d71a3fa7352efc1b608d2a69a;hb=87caecf37aca451b5b5e658416d6ddd19e62ae2b;hpb=02559f727995a3958936106a80c54a4b0a723f21

diff --git a/Makefile.am b/Makefile.am
index a0ff2d6..2a2d014 100644
--- 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
 
@@ -22,16 +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 \
-	libtool.m4 \
-	doxygen.m4 \
-	acx_pthread.m4 \
-	depcomp \
 	config_win32.h \
 	$(GENFILES) \
-	$(GENFILES:%=%.in) \
-	depend \
-	postinstall
+	$(GENFILES:%=%.in)