X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=blobdiff_plain;f=Makefile.am;h=e5c30ade376a7dfda299e45b567473f42266c727;hp=277ca6196257fa37af68a7ddf685d70fa9486450;hb=HEAD;hpb=76c21a35bec4106a11c2c960c2492b1ff2740b3c

diff --git a/Makefile.am b/Makefile.am
index 277ca61..e5c30ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
-AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+AUTOMAKE_OPTIONS = foreign dist-zip dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
 
 include doxygen.am
 
@@ -10,7 +9,21 @@ WANT_SUBDIRS = @WANT_SUBDIRS@
 
 SUBDIRS = $(WANT_SUBDIRS)
 
-DIST_SUBDIRS = doc schemas configs shibsp shibd adfs util apache nsapi_shib fastcgi odbc-store memcache-store selinux
+DIST_SUBDIRS = \
+	doc \
+	schemas \
+	configs \
+	shibsp \
+	shibd \
+	adfs \
+	plugins \
+	util \
+	apache \
+	nsapi_shib \
+	fastcgi \
+	odbc-store \
+	memcache-store \
+	selinux
 
 if DX_COND_doc
 all-local: doxygen-doc
@@ -18,24 +31,11 @@ else
 all-local:
 endif
 
-dist-hook:
-	rm -rf `find $(distdir)/isapi_shib -name .svn`
-	rm -rf `find $(distdir)/doc/api -name .svn`
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = @PACKAGE_NAME@.pc
-
-GENFILES = @PACKAGE_NAME@.spec pkginfo Portfile
+GENFILES = @PACKAGE_NAME@.spec
 
 EXTRA_DIST = $(DX_CONFIG) \
-    isapi_shib \
-    Shibboleth.sln \
-    libtool.m4 \
-    doxygen.m4 \
-    acx_pthread.m4 \
-    depcomp \
-    config_win32.h \
-    $(GENFILES) \
-    $(GENFILES:%=%.in) \
-    depend \
-    postinstall
+	isapi_shib \
+	Shibboleth.sln \
+	config_win32.h \
+	$(GENFILES) \
+	$(GENFILES:%=%.in)