[Xfce4-commits] <xfwm4:xfce-4.6> gitify the build generation

[Olivier Fourdan]

Updating branch refs/heads/xfce-4.6
         to a23b56de10d343c94abce299764d5a5786f7b0b6 (commit)
       from 03d5815fa2647b12dec0c1d25acc66dfe677916b (commit)

commit a23b56de10d343c94abce299764d5a5786f7b0b6
Author: Olivier Fourdan <fourdan at xfce.org>
Date:   Fri Sep 4 14:02:45 2009 +0200

    gitify the build generation

 configure.ac.in              |   10 +++++-----
 settings-dialogs/Makefile.am |    5 ++---
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 163958e..57523d9 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -5,10 +5,10 @@ dnl
 
 m4_define([xfwm4_version_major], [4])
 m4_define([xfwm4_version_minor], [6])
-m4_define([xfwm4_version_micro], [1])
-m4_define([xfwm4_version_build], [r at REVISION@])
-m4_define([xfwm4_version_tag],   [])
-m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(), [svn], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])])
+m4_define([xfwm4_version_micro], [2])
+m4_define([xfwm4_version_build], [@REVISION@])
+m4_define([xfwm4_version_tag],   [git])
+m4_define([xfwm4_version], [xfwm4_version_major().xfwm4_version_minor().xfwm4_version_micro()ifelse(xfwm4_version_tag(), [git], [xfwm4_version_tag().xfwm4_version_build()], [xfwm4_version_tag()])])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
@@ -204,7 +204,7 @@ REVISION=unknown
 if test x"@REVISION@" != x""; then
     REVISION=@REVISION@
 fi
-AC_DEFINE_UNQUOTED([REVISION], "$REVISION", [svn revision number])
+AC_DEFINE_UNQUOTED([REVISION], "$REVISION", [git id])
 AC_SUBST([REVISION])
 
 AC_OUTPUT([
diff --git a/settings-dialogs/Makefile.am b/settings-dialogs/Makefile.am
index ffed63d..739cd10 100644
--- a/settings-dialogs/Makefile.am
+++ b/settings-dialogs/Makefile.am
@@ -1,7 +1,7 @@
 bin_PROGRAMS = \
 xfwm4-settings  \
 xfwm4-tweaks-settings  \
-xfwm4-workspace-settings 
+xfwm4-workspace-settings
 
 noinst_DATA = \
 	monitor-icon.png \
@@ -130,5 +130,4 @@ EXTRA_DIST = \
 	xfwm4-dialog.glade
 
 DISTCLEANFILES = \
-	$(desktop_DATA)  \
-	monitor-icon.h
+	$(desktop_DATA)