NameIDFormat support.

[shibboleth/sp.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3ce1ce1..3d9bdc8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,37 +10,21 @@ 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 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)/isapi -name .svn`
+       rm -rf `find $(distdir)/isapi_shib -name .svn`
        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 pkginfo Portfile
 
 EXTRA_DIST = $(DX_CONFIG) \
-    $(APIDOCS) \
     isapi_shib \
     Shibboleth.sln \
     libtool.m4 \
@@ -48,10 +32,7 @@ EXTRA_DIST = $(DX_CONFIG) \
     acx_pthread.m4 \
     depcomp \
     config_win32.h \
-    shibboleth.spec.in \
-    shibboleth.spec \
-    pkginfo.in \
-    pkginfo \
-    checkinstall
-
-DISTCLEANFILES = shibboleth.spec pkginfo
+    $(GENFILES) \
+    $(GENFILES:%=%.in) \
+    depend \
+    postinstall