Track revision and version from git

config/Doxyfile.in

@@ -31,7 +31,7 @@ PROJECT_NAME          = "sipXecs @PACKAGE@"
 # This could be handy for archiving the generated documentation or
 # if some version control system is used.
 
-PROJECT_NUMBER        = "Version @SIPX_VERSION@ @SIPX_BUILDSTAMP@"
+PROJECT_NUMBER        = "Version @PACKAGE_VERSION@ @PACKAGE_RELEASE@"
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
 # base path where the generated documentation will be put.

config/doxygen.am

@@ -37,7 +37,6 @@ $(foreach doc,$(CopiedDocs),@PACKAGE@/$(doc)): @PACKAGE@/% : %
 Doxyfile: $(top_srcdir)/config/Doxyfile.in Doxyfile.project
 	@echo "creating Doxyfile from template"
 	@$(LocalizeSipXconfig) \
-		-e 's,@SIPX_BUILDSTAMP\@,$(SIPX_BUILDSTAMP),g' \
 		-e 's,@enable_html_docs\@,@enable_html_docs@,g' \
 		-e 's,@enable_latex_docs\@,@enable_latex_docs@,g' \
 		-e 's,@have_dot\@,@have_dot@,g' \

config/git-version-gen

@@ -1,6 +1,6 @@
 #!/bin/sh
 # Print a version string.
-scriptversion=2010-12-16.21; # UTC
+scriptversion=2010-12-17.06; # UTC
 
 # Copyright (C) 2007-2010 Free Software Foundation, Inc.
 #
@@ -69,7 +69,7 @@ scriptversion=2010-12-16.21; # UTC
 case $# in
     1|2) ;;
     *) echo 1>&2 "Usage: $0 \$srcdir/.tarball-version" \
-         '[TAG-NORMALIZATION-SED-SCRIPT] [dir where .git is located]'
+         '[TAG-NORMALIZATION-SED-SCRIPT]'
        exit 1;;
 esac
 

config/project.am

@@ -1,40 +1,30 @@
 include config/subdir.am
-include config/dist.am
 
-all: BUILDSTAMP
+EXTRA_DIST = \
+    config/git-version-gen \
+    CONTRIBUTORS \
+    $(@PACKAGE@_EXTRA_DIST)
 
-## BUILDSTAMP records the subversion revision, date/time, which builder built
-## this, and the repository branch (if it is not main).
-## It also creates a C source file config/sipX-buildstamp.cpp containing
-## the same information.
+# defined as empty target so if a package does not override, it's a nop
+%-dist-hook:;
 
-.PHONY: BUILDSTAMP
-BUILDSTAMP:
-	@echo -n "Generating BUILDSTAMP: "
-	@test -d config || mkdir config
-	@echo "$(SIPX_BUILDSTAMP)" > BUILDSTAMP
-	@${LocalizeSipXconfig} \
-		-e "s/@SIPX_VERSION\@/$(SIPX_VERSION)/" \
-		-e "s/@SIPX_BUILDSTAMP\@/$(SIPX_BUILDSTAMP)/" \
-		-e "s/sipx/SipX/" \
-	    $(srcdir)/config/sipX-buildstamp.cpp.in \
-	> config/@[email protected]
-	@${LocalizeSipXconfig} \
-		-e "s/sipx/SipX/" \
-	    $(srcdir)/config/sipX-buildstamp.h.in \
-	> config/@[email protected]
-	@echo "$(SIPX_BUILDSTAMP)"
-
-# automake doesn't like this inside the conditional
-.PHONY : doc
+dist-hook: @PACKAGE@-dist-hook
+	echo $(VERSION).$(subst .,-,$(PACKAGE_REVISION)) > $(distdir)/.tarball-version
+	@$(LocalizeSipXconfig) $(srcdir)/@[email protected] > $(distdir)/@[email protected]
 
 # CONFIG_DISTCLEANFILES are files to be added to DISTCLEANFILES in any
 # makefile that includes config as an external subdirectory.
-CONFIG_DISTCLEANFILES = \
+DISTCLEANFILES = \
+        $(@PACKAGE@-DISTCLEANFILES) \
 	config/config.sub \
 	config/depcomp \
 	config/install-sh \
 	config/ltmain.sh \
 	config/missing \
-	config/@[email protected] \
-	config/@[email protected]
+	Makefile.in \
+	aclocal.m4 \
+	autom4te.cache/output.0 \
+	autom4te.cache/output.1 \
+	autom4te.cache/requests \
+	autom4te.cache/traces.0 \
+	autom4te.cache/traces.1