X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=84148a01dd722db4ef493e64956b12ceca315d4c;hb=4e10c1842e2081b50d6838b8e38a4b91eb74d564;hp=274bf2cc22098614e825cbf5be482607e63830e3;hpb=a01e3f87ebd87f3f3df92f17d8d0cda5825d5275;p=shibboleth%2Fcpp-opensaml.git

diff --git a/Makefile.am b/Makefile.am
index 274bf2c..84148a0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,43 +6,29 @@ include doxygen.am
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
-EXTRA_DIST = $(DX_CONFIG) \
-	doc \
-	schemas \
-	cpp-opensaml.sln \
-	libtool.m4 \
-	doxygen.m4 \
-	depcomp \
-	config_win32.h \
-	opensaml.spec.in \
-	opensaml.spec \
-	pkginfo.in \
-	pkginfo \
-	checkinstall
-
-
 dist-hook:
 	rm -rf `find $(distdir)/samltest/data -name .svn`
-	rm -rf `find $(distdir)/schemas -name .svn`
-	rm -rf `find $(distdir)/schemas -name Makefile`
-	rm -rf `find $(distdir)/doc -name .svn`
-	rm -rf `find $(distdir)/doc -name Makefile`
+	rm -rf `find $(distdir)/doc/api -name .svn`
 
 
-SUBDIRS = schemas saml samltest
+SUBDIRS = doc schemas saml samltest samlsign
 
-all-local: opensaml.spec pkginfo doxygen-doc
+if DX_COND_doc
+all-local: doxygen-doc
+else
+all-local:
+endif
 
-opensaml.spec: opensaml.spec.in Makefile
-	rm -f $@.tmp
-	sed < $< > $@.tmp \
-	    -e 's:@-VERSION-@:${VERSION}:'
-	mv $@.tmp $@
+GENFILES = opensaml.spec pkginfo Portfile
 
-pkginfo: pkginfo.in Makefile
-	rm -f $@.tmp
-	sed < $< > $@.tmp \
-	    -e 's:@-VERSION-@:${VERSION}:'
-	mv $@.tmp $@
-
-DISTCLEANFILES = opensaml.spec pkginfo
+EXTRA_DIST = $(DX_CONFIG) \
+	cpp-opensaml2.sln \
+	libtool.m4 \
+	doxygen.m4 \
+	acx_pthread.m4 \
+	depcomp \
+	config_win32.h \
+	$(GENFILES) \
+	$(GENFILES:%=%.in) \
+	depend \
+	postinstall