Set fourth file version digit to signify rebuild.

[shibboleth/cpp-xmltooling.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9cfcebb..01dbcc1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,43 +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)
 
+DISTCLEANFILES = \
+       @PACKAGE_NAME@.pc \
+       @PACKAGE_NAME@.pc.in \
+       @PACKAGE_NAME@-uninstalled.pc \
+       @PACKAGE_NAME@-uninstalled.sh
+
+SUBDIRS = doc schemas @PACKAGE_NAME@ xmltoolingtest
+
+if DX_COND_doc
+all-local: doxygen-doc
+else
+all-local:
+endif
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = @PACKAGE_NAME@.pc
+
+GENFILES = @PACKAGE_NAME@.spec
+
 EXTRA_DIST = $(DX_CONFIG) \
-       doc \
-       schemas \
-       cpp-xmltooling.sln \
-       libtool.m4 \
-       acx_pthread.m4 \
-       doxygen.m4 \
-       depcomp \
-       config_win32.h
-
-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`
-
-
-SUBDIRS = schemas xmltooling xmltoolingtest
-
-all-local: xmltooling.spec pkginfo doxygen-doc
-
-xmltooling.spec: xmltooling.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 $@
-
-DISTCLEANFILES = xmltooling.spec pkginfo
+       cpp-@PACKAGE_NAME@.sln \
+       config_win32.h \
+       $(GENFILES) \
+       $(GENFILES:%=%.in)