X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=c5ec8336d3cdc4ecc209f0b8b952eabe5a2f8446;hb=7597281b440366355c812ede250ea2d1d0761d14;hp=a3401f080df7c4b5ae207ed4ec999d10dc3046a1;hpb=f2d67043b6882a4262a486f05990b3133e5b9747;p=shibboleth%2Fcpp-sp.git

diff --git a/Makefile.am b/Makefile.am
index a3401f0..c5ec833 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,56 +1,45 @@
 AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
 
 include doxygen.am
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
+dist-hook:
+	rm -rf `find $(distdir)/msbuild -name .svn`
+
 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@
-
-dist-hook:
-	rm -rf `find $(distdir)/doc/api -name .svn`
-
-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 \
+	msbuild \
+	$(GENFILES) \
+	$(GENFILES:%=%.in)