From 996bfb2b4839ba58e8b78dd7f969ac49c8cf1b33 Mon Sep 17 00:00:00 2001
From: Jef Driesen <jefdriesen@users.sourceforge.net>
Date: Mon, 3 May 2010 14:20:05 +0000
Subject: [PATCH] Move the subversion revision number to a private header.

---
 configure.ac     |  1 +
 src/Makefile.am  | 15 +++++----------
 src/version.c    |  1 -
 src/version.h.in |  2 --
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2b39cbc..d1442dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,7 @@ AC_CONFIG_FILES([
    libdivecomputer.pc
    Makefile
    src/Makefile
+   src/version.h
    src/libdivecomputer.rc
    examples/Makefile
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index 2074660..5f47f5e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -125,14 +125,9 @@ $(top_srcdir)/revision: FORCE
 	  if ! test -f $@; then touch $@; fi; \
 	fi
 
-version.h: $(top_srcdir)/revision version.h.in Makefile.am
-	$(AM_V_GEN) sed \
-		-e 's/\@DC_VERSION_MAJOR\@/@DC_VERSION_MAJOR@/' \
-		-e 's/\@DC_VERSION_MINOR\@/@DC_VERSION_MINOR@/' \
-		-e 's/\@DC_VERSION_MICRO\@/@DC_VERSION_MICRO@/' \
-		-e 's/\@DC_VERSION_EXTRA\@/'`cat $(top_srcdir)/revision`'/' \
-		$(srcdir)/version.h.in > $@
+revision.h: $(top_srcdir)/revision Makefile.am
+	$(AM_V_GEN) echo "#define DC_VERSION_REVISION \""`cat $(top_srcdir)/revision`"\"" > $@
 
-BUILT_SOURCES = version.h
-EXTRA_DIST = libdivecomputer.symbols $(top_srcdir)/revision version.h.in
-CLEANFILES = libdivecomputer.exp revision-t
+BUILT_SOURCES = revision.h
+EXTRA_DIST = libdivecomputer.symbols $(top_srcdir)/revision
+CLEANFILES = libdivecomputer.exp revision.h revision-t
diff --git a/src/version.c b/src/version.c
index 452a470..90e7bad 100644
--- a/src/version.c
+++ b/src/version.c
@@ -28,7 +28,6 @@ dc_version (dc_version_t *version)
 		version->major = DC_VERSION_MAJOR;
 		version->minor = DC_VERSION_MINOR;
 		version->micro = DC_VERSION_MICRO;
-		version->extra = DC_VERSION_EXTRA;
 	}
 
 	return DC_VERSION;
diff --git a/src/version.h.in b/src/version.h.in
index 48d96fe..5e64e01 100644
--- a/src/version.h.in
+++ b/src/version.h.in
@@ -30,7 +30,6 @@ extern "C" {
 #define DC_VERSION_MAJOR @DC_VERSION_MAJOR@
 #define DC_VERSION_MINOR @DC_VERSION_MINOR@
 #define DC_VERSION_MICRO @DC_VERSION_MICRO@
-#define DC_VERSION_EXTRA "@DC_VERSION_EXTRA@"
 
 #define DC_VERSION_CHECK(major,minor,micro) \
 	(DC_VERSION_MAJOR > (major) || \
@@ -42,7 +41,6 @@ typedef struct dc_version_t {
 	unsigned int major;
 	unsigned int minor;
 	unsigned int micro;
-	const char *extra;
 } dc_version_t;
 
 const char *