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

diff --git a/Makefile.am b/Makefile.am
index 274bf2c..d5ae159 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,48 +1,31 @@
 AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
 
 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 $@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = @PACKAGE_NAME@.pc
 
-pkginfo: pkginfo.in Makefile
-	rm -f $@.tmp
-	sed < $< > $@.tmp \
-	    -e 's:@-VERSION-@:${VERSION}:'
-	mv $@.tmp $@
+GENFILES = @PACKAGE_NAME@.spec pkginfo Portfile
 
-DISTCLEANFILES = opensaml.spec pkginfo
+EXTRA_DIST = $(DX_CONFIG) \
+	cpp-opensaml2.sln \
+	config_win32.h \
+	$(GENFILES) \
+	$(GENFILES:%=%.in) \
+	postinstall