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

diff --git a/Makefile.am b/Makefile.am
index b432a54..e0b3888 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,16 @@
 AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
 
 include doxygen.am
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
+DISTCLEANFILES = \
+	@PACKAGE_NAME@.pc \
+	@PACKAGE_NAME@.pc.in \
+	@PACKAGE_NAME@-uninstalled.pc \
+	@PACKAGE_NAME@-uninstalled.sh
+
 dist-hook:
 	rm -rf `find $(distdir)/samltest/data -name .svn`
 	rm -rf `find $(distdir)/doc/api -name .svn`
@@ -14,41 +19,18 @@ dist-hook:
 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)