X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fcpp-xmltooling.git;a=blobdiff_plain;f=Makefile.am;h=01dbcc1871dda51bbd0790ed1a1ae822731c5863;hp=181d777e30a41ede52263130cb8d8001be5dfa7c;hb=HEAD;hpb=bc4afc63e9be0b9572bc9e72d58a270ecb3fa231

diff --git a/Makefile.am b/Makefile.am
index 181d777..01dbcc1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,53 +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)/xmltoolingtest/data -name .svn`
-
+DISTCLEANFILES = \
+	@PACKAGE_NAME@.pc \
+	@PACKAGE_NAME@.pc.in \
+	@PACKAGE_NAME@-uninstalled.pc \
+	@PACKAGE_NAME@-uninstalled.sh
 
-SUBDIRS = doc schemas xmltooling xmltoolingtest
-
-all-local: xmltooling.spec pkginfo
+SUBDIRS = doc schemas @PACKAGE_NAME@ xmltoolingtest
 
 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@
-
-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
 
 EXTRA_DIST = $(DX_CONFIG) \
-        $(APIDOCS) \
-        cpp-xmltooling.sln \
-        acx_pthread.m4 \
-        acinclude.m4 \
-        libtool.m4 \
-        doxygen.m4 \
-        depcomp \
-        config_win32.h \
-        xmltooling.spec.in \
-        xmltooling.spec \
-        pkginfo.in \
-        pkginfo \
-        checkinstall
-
-DISTCLEANFILES = xmltooling.spec pkginfo
+	cpp-@PACKAGE_NAME@.sln \
+	config_win32.h \
+	$(GENFILES) \
+	$(GENFILES:%=%.in)