Reorder libtool macros.

[shibboleth/sp.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b006f94..3d9bdc8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,40 +2,37 @@ AUTOMAKE_OPTIONS = foreign
 
 ACLOCAL_AMFLAGS = -I .
 
-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
+include doxygen.am
 
-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
+DIST_SUBDIRS = doc schemas configs shibsp shibd adfs util apache nsapi_shib fastcgi odbc-store memcache-store selinux
 
-shibboleth.spec: shibboleth.spec.in Makefile
-       rm -f $@.tmp
-       sed < $< > $@.tmp \
-           -e 's:@-VERSION-@:${VERSION}:'
-       mv $@.tmp $@
+if DX_COND_doc
+all-local: doxygen-doc
+else
+all-local:
+endif
 
-pkginfo: pkginfo.in Makefile
-       rm -f $@.tmp
-       sed < $< > $@.tmp \
-           -e 's:@-VERSION-@:${VERSION}:'
-       mv $@.tmp $@
-
-DISTCLEANFILES = shibboleth.spec pkginfo
+dist-hook:
+       rm -rf `find $(distdir)/isapi_shib -name .svn`
+       rm -rf `find $(distdir)/doc/api -name .svn`
+
+GENFILES = @PACKAGE_NAME@.spec pkginfo Portfile
+
+EXTRA_DIST = $(DX_CONFIG) \
+    isapi_shib \
+    Shibboleth.sln \
+    libtool.m4 \
+    doxygen.m4 \
+    acx_pthread.m4 \
+    depcomp \
+    config_win32.h \
+    $(GENFILES) \
+    $(GENFILES:%=%.in) \
+    depend \
+    postinstall