ceph_ver: add unconditional rule

diff --git a/src/Makefile.am b/src/Makefile.am
index be8d0e13241633479fef04db9665bd24f94bec71..667494ab18280bbb0cc6a136d137ccb6e05a04f2 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -177,7 +177,10 @@ install-data-local:
        $(install_sh_SCRIPT) -m 0600 sample.ceph.conf $(DESTDIR)$(sysconfdir)/ceph/sample.ceph.conf
        $(install_sh_SCRIPT) -m 0600 sample.cluster.conf $(DESTDIR)$(sysconfdir)/ceph/sample.cluster.conf
 
-ceph_ver.h : $(all_sources)
+.make_last_ver:
+       ./make_version --check
+
+ceph_ver.h : $(all_sources) .make_last_ver
        ./make_version
 
 ceph_ver.c : ceph_ver.h

diff --git a/src/make_version b/src/make_version
index 5da346e561e01a432832ee7a3e5da1b3acd699bf..fff9025c5a396e2e8a32ad20e919ab381ad83103 100755 (executable)
--- a/src/make_version
+++ b/src/make_version
@@ -1,6 +1,19 @@
 #!/bin/bash
 
 
+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
+       echo "#endif"
+}
+
+write_last_ver() {
+       echo $git_ver > $dname/.make_last_ver
+}
+
 dname=`dirname $0`
 
 git_ver=`git-rev-parse HEAD 2>/dev/null`
@@ -9,18 +22,10 @@ git_ver=`git-rev-parse HEAD 2>/dev/null`
   [ -e $dname/ceph_ver.h ] && \
   [ "$git_ver" == "`cat $dname/.make_last_ver`" ] && exit
 
+[ "$1" == "--check" ] && write_last_ver && exit
 
-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
-echo "#endif"
-
-}
 
 print_all > $dname/ceph_ver.h
 
-echo $git_ver > $dname/.make_last_ver
-       
+write_last_ver
+