X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-opensaml.git;a=blobdiff_plain;f=Makefile.am;h=2a2d0141e846ed2c9c1b43e3610a4b32d54ca9f2;hp=b432a544f6fa9e65d7f92b0591d25181e8c484a0;hb=87caecf37aca451b5b5e658416d6ddd19e62ae2b;hpb=a8ff2776617ab61bfc9cb3095a5c7da25f5983de

diff --git a/Makefile.am b/Makefile.am
index b432a54..2a2d014 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,54 +1,31 @@
-AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+AUTOMAKE_OPTIONS = foreign dist-zip dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
 
 include doxygen.am
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
-dist-hook:
-	rm -rf `find $(distdir)/samltest/data -name .svn`
-	rm -rf `find $(distdir)/doc/api -name .svn`
-
+DISTCLEANFILES = \
+	@PACKAGE_NAME@.pc \
+	@PACKAGE_NAME@.pc.in \
+	@PACKAGE_NAME@-uninstalled.pc \
+	@PACKAGE_NAME@-uninstalled.sh
 
 SUBDIRS = doc schemas saml samltest samlsign
 
 if DX_COND_doc
-all-local: opensaml.spec pkginfo doxygen-doc
-APIDOCS = doc/api
+all-local: doxygen-doc
 else
-all-local: opensaml.spec pkginfo
+all-local:
 endif
 
-install-data-hook:
-	rm -rf $(DESTDIR)$(datadir)/doc/@PACKAGE@/api
-	cp -r doc/api $(DESTDIR)$(datadir)/doc/@PACKAGE@
-
-opensaml.spec: opensaml.spec.in Makefile
-	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
-	    -e 's:@-VERSION-@:${VERSION}:'
-	mv $@.tmp $@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = @PACKAGE_NAME@.pc
 
-pkginfo: pkginfo.in Makefile
-	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
-	    -e 's:@-VERSION-@:${VERSION}:'
-	mv $@.tmp $@
+GENFILES = @PACKAGE_NAME@.spec
 
 EXTRA_DIST = $(DX_CONFIG) \
-	$(APIDOCS) \
 	cpp-opensaml2.sln \
-	libtool.m4 \
-	doxygen.m4 \
-	acx_pthread.m4 \
-	depcomp \
 	config_win32.h \
-	opensaml.spec.in \
-	opensaml.spec \
-	pkginfo.in \
-	pkginfo \
-	depend \
-	postinstall
-
-DISTCLEANFILES = opensaml.spec pkginfo
+	$(GENFILES) \
+	$(GENFILES:%=%.in)