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

diff --git a/Makefile.am b/Makefile.am
index 94f7c83..e0b3888 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,52 +1,36 @@
 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`
 
 
-SUBDIRS = doc schemas saml samltest
-
-all-local: opensaml.spec pkginfo
+SUBDIRS = doc schemas saml samltest samlsign
 
 if DX_COND_doc
 all-local: doxygen-doc
-APIDOCS = doc/api
+else
+all-local:
 endif
 
-install-data-hook:
-	rm -rf $(prefix)/doc/@PACKAGE@/api
-	cp -r doc/api $(prefix)/doc/@PACKAGE@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = @PACKAGE_NAME@.pc
 
-opensaml.spec: opensaml.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
 
 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 \
-	checkinstall
-
-DISTCLEANFILES = opensaml.spec pkginfo
+	$(GENFILES) \
+	$(GENFILES:%=%.in)