Makefile: fix up ceph_ver.h autogeneration

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/Makefile.am b/src/Makefile.am
index db84810444839830b6e6fd3d97e6ef6c823c1afe..acaf36c8da1cf371b92f6c4f565d3a7d44500f6b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -313,19 +313,18 @@ install-data-local:
        $(install_sh_SCRIPT) -m 0644 crush/types.h $(DESTDIR)$(includedir)/crush/types.h
        $(install_sh_SCRIPT) -m 0644 crush/mapper.h $(DESTDIR)$(includedir)/crush/mapper.h
 
-.make_last_ver:
-       ./make_version --check
-
-ceph_ver.h: $(all_sources) .make_last_ver
-       ./make_version
+FORCE:
+.git_version: FORCE
+       ./check_version .git_version
+ceph_ver.h: .git_version
+       ./make_version .git_version ceph_ver.h
 
 ceph_ver.c: ceph_ver.h
-common/debug.cc: ceph_ver.h
+common/debug.cc: ceph_ver.h 
 config.cc: ceph_ver.h
 
 
 
-
 # cleaning
 clean-local:
        -rm *.so

diff --git a/src/check_version b/src/check_version
new file mode 100755 (executable)
index 0000000..bce3ba5
--- /dev/null
+++ b/src/check_version
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+dname=`dirname $0`
+cur=`git rev-parse HEAD 2>/dev/null`
+[ -e $1 ] && old=`cat $1`
+
+if [ "$cur" != "$old" ]; then
+    echo regenerating $1 with $cur
+    echo $cur > $1
+else
+    echo $1 is up to date.
+fi
+

diff --git a/src/make_version b/src/make_version
index 67f06194671f12b397d1f598783b0d302450e177..8fc19656b7a74c9c3e59fa709774c1c72cb5fd1c 100755 (executable)
--- a/src/make_version
+++ b/src/make_version
@@ -1,31 +1,14 @@
 #!/bin/bash
 
+cur=`cat $1`
 
 print_all() {
        echo "#ifndef CEPH_VERSION_H"
        echo "#define CEPH_VERSION_H"
        echo
-       echo "#define CEPH_GIT_VER `git rev-parse HEAD 2>/dev/null`"
+       echo "#define CEPH_GIT_VER $cur"
        echo
        echo "#endif"
 }
 
-write_last_ver() {
-       echo $git_ver > $dname/.make_last_ver
-}
-
-dname=`dirname $0`
-
-git_ver=`git rev-parse HEAD 2>/dev/null`
-
-[ -e $dname/.make_last_ver ] && \
-  [ -e $dname/ceph_ver.h ] && \
-  [ "$git_ver" == "`cat $dname/.make_last_ver`" ] && exit
-
-[ "$1" == "--check" ] && write_last_ver && exit
-
-
-print_all > $dname/ceph_ver.h
-
-write_last_ver
-
+print_all > $2