X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=d918f6bff4c6f54a5be466f96788a6c21badeae4;hb=4fd97a9fce699269ef44adf0ff64985742cd8d10;hp=c3c55a955513ce6c72c89e0b630fc58b44ee751c;hpb=503a12f862f7af8c9f715d1cc01d06476dde08a1;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/Makefile.am b/Makefile.am
index c3c55a9..d918f6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,43 +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)/xmltoolingtest/data -name .svn`
 	rm -rf `find $(distdir)/doc/api -name .svn`
 
 
-SUBDIRS = doc schemas xmltooling xmltoolingtest
-
-GENFILES = xmltooling.spec pkginfo Portfile
+SUBDIRS = doc schemas @PACKAGE_NAME@ xmltoolingtest
 
 if DX_COND_doc
-all-local: doxygen-doc $(GENFILES)
+all-local: doxygen-doc
 else
-all-local: $(GENFILES)
+all-local:
 endif
 
-$(GENFILES): %: %.in Makefile
-	rm -f $@.tmp
-	sed < $@.in > $@.tmp \
-	    -e 's:@-VERSION-@:${VERSION}:'
-	mv $@.tmp $@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = @PACKAGE_NAME@.pc
+
+GENFILES = @PACKAGE_NAME@.spec
 
 EXTRA_DIST = $(DX_CONFIG) \
-        cpp-xmltooling.sln \
-        acx_pthread.m4 \
-        acinclude.m4 \
-        libtool.m4 \
-        doxygen.m4 \
-        depcomp \
+        cpp-@PACKAGE_NAME@.sln \
         config_win32.h \
         $(GENFILES) \
-        $(GENFILES:%=%.in) \
-        depend \
-        postinstall
-
-DISTCLEANFILES = $(GENFILES)
+        $(GENFILES:%=%.in)