X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Makefile.am;h=d918f6bff4c6f54a5be466f96788a6c21badeae4;hb=dcb6f62a0c08d1ceac689fae792199a3cd539e59;hp=2afd6ffabc51a95ad595a7ac633aea5ed07ee25d;hpb=1d98fccf9b396a09f8d5bc21d5b7e604afba654b;p=shibboleth%2Fcpp-xmltooling.git

diff --git a/Makefile.am b/Makefile.am
index 2afd6ff..d918f6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,47 +1,36 @@
 AUTOMAKE_OPTIONS = foreign
-
-ACLOCAL_AMFLAGS = -I .
+ACLOCAL_AMFLAGS = -I m4
 
 include doxygen.am
 
 MOSTLYCLEANFILES = $(DX_CLEANFILES)
 
-EXTRA_DIST = $(DX_CONFIG) \
-	doc \
-	schemas \
-	cpp-xmltooling.sln \
-	libtool.m4 \
-	doxygen.m4 \
-	depcomp \
-	config_win32.h \
-	xmltooling.spec.in \
-	xmltooling.spec \
-	pkginfo.in \
-	pkginfo \
-	checkinstall
+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)/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 xmltooling xmltoolingtest
+SUBDIRS = doc schemas @PACKAGE_NAME@ xmltoolingtest
 
-all-local: xmltooling.spec pkginfo doxygen-doc
+if DX_COND_doc
+all-local: doxygen-doc
+else
+all-local:
+endif
 
-xmltooling.spec: xmltooling.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
 
-DISTCLEANFILES = xmltooling.spec pkginfo
+EXTRA_DIST = $(DX_CONFIG) \
+        cpp-@PACKAGE_NAME@.sln \
+        config_win32.h \
+        $(GENFILES) \
+        $(GENFILES:%=%.in)