X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=e5c30ade376a7dfda299e45b567473f42266c727;hb=0121a474a60158d6478ce4697407c31d71d3c76e;hp=b1260bc2ef1ec91ac1f55e09845c0fab95771071;hpb=8fef4d747ead5b06931a705a538f9bfd1133e74c;p=shibboleth%2Fcpp-sp.git

diff --git a/Makefile.am b/Makefile.am
index b1260bc..e5c30ad 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,5 @@
-AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+AUTOMAKE_OPTIONS = foreign dist-zip dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
 
 include doxygen.am
 
@@ -10,44 +9,33 @@ WANT_SUBDIRS = @WANT_SUBDIRS@
 
 SUBDIRS = $(WANT_SUBDIRS)
 
-DIST_SUBDIRS = doc schemas configs shibsp shibd adfs util apache nsapi_shib fastcgi odbc-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: shibboleth.spec pkginfo doxygen-doc
-APIDOCS = doc/api
+all-local: doxygen-doc
 else
-all-local: shibboleth.spec pkginfo
+all-local:
 endif
 
-install-data-hook:
-	rm -rf $(DESTDIR)$(datadir)/doc/@PACKAGE@/api
-	cp -r doc/api $(DESTDIR)$(datadir)/doc/@PACKAGE@
-
-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 $@
+GENFILES = @PACKAGE_NAME@.spec
 
 EXTRA_DIST = $(DX_CONFIG) \
-    $(APIDOCS) \
-    isapi_shib \
-    Shibboleth.sln \
-    libtool.m4 \
-    doxygen.m4 \
-    acx_pthread.m4 \
-    depcomp \
-    config_win32.h \
-    shibboleth.spec.in \
-    shibboleth.spec \
-    pkginfo.in \
-    pkginfo \
-    checkinstall
-
-DISTCLEANFILES = shibboleth.spec pkginfo
+	isapi_shib \
+	Shibboleth.sln \
+	config_win32.h \
+	$(GENFILES) \
+	$(GENFILES:%=%.in)