X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=blobdiff_plain;f=Makefile.am;h=4fb593f07a98ae906098f14cd9d7bd78a1acc395;hp=96b88230d82ed18fd97a334625f86fdb3b24a3b3;hb=7a8806efca2d7135ef9a3900b47329dbc5674f72;hpb=6ffd8c15e5e3d7f7278c62beaf3476b236a62c36

diff --git a/Makefile.am b/Makefile.am
index 96b8823..4fb593f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+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,21 +31,11 @@ else
 all-local:
 endif
 
-dist-hook:
-	rm -rf `find $(distdir)/isapi_shib -name .svn`
-	rm -rf `find $(distdir)/doc/api -name .svn`
-
-GENFILES = shibboleth.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)