X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=e5c30ade376a7dfda299e45b567473f42266c727;hb=90d37dd6bfed6b440175523ae4b7830eefc3fa7e;hp=b60ac5dacbd82719788d09a0d3d99a1d9fb6ce4d;hpb=b7d28020a1eea965c73eace39cd8edf5317d79a1;p=shibboleth%2Fcpp-sp.git

diff --git a/Makefile.am b/Makefile.am
index b60ac5d..e5c30ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,25 +1,41 @@
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign dist-zip dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
 
-ACLOCAL_AMFLAGS = -I .
+include doxygen.am
 
-EXTRA_DIST = \
-	schemas doc isapi_shib \
-	Shibboleth.dsw libtool.m4 acx_pthread.m4 acx_rpctest.m4 \
-    posttest/posttest.dsp \
-    shibtest/shibtest.dsp
-
-dist-hook:
-	rm -rf `find $(distdir)/schemas -name CVS`
-	rm -rf `find $(distdir)/schemas -name Makefile`
-	rm -rf `find $(distdir)/configs -name CVS`
-	rm -rf `find $(distdir)/configs -name Makefile`
-	rm -rf `find $(distdir)/doc -name CVS`
-	rm -rf `find $(distdir)/doc -name Makefile`
-	rm -rf `find $(distdir)/isapi_shib -name CVS`
+MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
 WANT_SUBDIRS = @WANT_SUBDIRS@
 
 SUBDIRS = $(WANT_SUBDIRS)
 
-DIST_SUBDIRS = doc oncrpc shib schemas configs shib-target shar test \
-	apache siterefresh shib-mysql-ccache xmlproviders
+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
+else
+all-local:
+endif
+
+GENFILES = @PACKAGE_NAME@.spec
+
+EXTRA_DIST = $(DX_CONFIG) \
+	isapi_shib \
+	Shibboleth.sln \
+	config_win32.h \
+	$(GENFILES) \
+	$(GENFILES:%=%.in)