X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=4fb593f07a98ae906098f14cd9d7bd78a1acc395;hb=aee77710f45c5f5723d9cf47f3d0755aaa7c62e2;hp=b006f945296a6a9556680fb5f6b6b20128d102d4;hpb=ed2841a8a8f5100d0a3b07ad2f491090708af240;p=shibboleth%2Fcpp-sp.git

diff --git a/Makefile.am b/Makefile.am
index b006f94..4fb593f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,41 +1,41 @@
 AUTOMAKE_OPTIONS = foreign
+ACLOCAL_AMFLAGS = -I m4
 
-ACLOCAL_AMFLAGS = -I .
+include doxygen.am
 
-EXTRA_DIST = \
-	schemas doc isapi_shib isapi_shib_gui \
-	Shibboleth.sln libtool.m4 acx_pthread.m4 acx_rpctest.m4 depcomp \
-	config_win32.h posttest/posttest.vcproj shibtest/shibtest.vcproj \
-	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 shib schemas configs shib-target shar test \
-	apache siterefresh odbc_ccache nsapi_shib 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)