X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-sp.git;a=blobdiff_plain;f=Makefile.am;h=e5c30ade376a7dfda299e45b567473f42266c727;hp=a6c3d6afb2ccc52b95ded469eafb919c7c967e1c;hb=3f41710ec90e5bcbecc5f095c636496b44fba83f;hpb=879969841bb617a7fa5acc7fe65150151d9b97a2

diff --git a/Makefile.am b/Makefile.am
index a6c3d6a..e5c30ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,41 +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 isapi_shib_gui \
-	Shibboleth.dsw libtool.m4 acx_pthread.m4 acx_rpctest.m4 depcomp \
-	config_win32.h posttest/posttest.dsp shibtest/shibtest.dsp \
-	shibboleth.spec.in shibboleth.spec pkginfo.in pkginfo checkinstall
-
-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 selinux
-
-all-local: shibboleth.spec pkginfo
-
-shibboleth.spec: shibboleth.spec.in Makefile
-	rm -f $@.tmp
-	sed < $< > $@.tmp \
-	    -e 's:@-VERSION-@:${VERSION}:'
-	mv $@.tmp $@
-
-pkginfo: pkginfo.in Makefile
-	rm -f $@.tmp
-	sed < $< > $@.tmp \
-	    -e 's:@-VERSION-@:${VERSION}:'
-	mv $@.tmp $@
-
-DISTCLEANFILES = shibboleth.spec pkginfo
+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)