From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Fri, 26 Oct 2012 08:40:14 +0000 (+0200)
Subject: Improve handling of git version.
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=37681f0e663e199c5f7b4e541028a5d9bc52913e

Improve handling of git version.
---

diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am
index fa0c08b0..0c10c05d 100644
--- a/coreapi/Makefile.am
+++ b/coreapi/Makefile.am
@@ -1,5 +1,7 @@
 GITVERSION_FILE=liblinphone_gitversion.h
 GITVERSION_FILE_TMP=liblinphone_gitversion.h.tmp
+GITDESCRIBE=$(shell git describe)
+GITREVISION=$(shell git rev-parse HEAD)
 
 ECHO=/bin/echo
 
@@ -107,15 +109,17 @@ endif
 
 AM_CXXFLAGS=$(AM_CFLAGS)
 
-$(GITVERSION_FILE):
-	if test -d $(top_srcdir)/.git ; then \
-		$(ECHO) -n "#define LIBLINPHONE_GIT_VERSION " > $(GITVERSION_FILE_TMP) &&\
-		$(ECHO) \"`cd $(top_srcdir) && git describe`\" >> $(GITVERSION_FILE_TMP) &&\
-		if test "`cat $(GITVERSION_FILE_TMP)`" != "`cat $(srcdir)/$(GITVERSION_FILE)`" ; then \
-			cp -f $(GITVERSION_FILE_TMP) $(srcdir)/$(GITVERSION_FILE) ; \
-		fi \
-		&& rm -f $(GITVERSION_FILE_TMP) ;\
+make_gitversion_h:
+	if test "$(GITDESCRIBE)" != "" ; then \
+		$(ECHO) -n "#define LIBLINPHONE_GIT_VERSION \"$(GITDESCRIBE)\"" > $(GITVERSION_FILE_TMP) ; \
+	elif test "$(GITREVISION)" != "" ; then \
+		$(ECHO) -n "#define LIBLINPHONE_GIT_VERSION \"$(LINPHONE_VERSION)_$(GITREVISION)\"" > $(GITVERSION_FILE_TMP) ; \
+	else \
+		$(ECHO) -n "" > $(GITVERSION_FILE_TMP) ; \
 	fi
-	if ! test -f $(srcdir)/$(GITVERSION_FILE) ; then \
-		$(ECHO) -n "" > $(srcdir)/$(GITVERSION_FILE) ;\
+	if test "`cat $(GITVERSION_FILE_TMP)`" != "`cat $(srcdir)/$(GITVERSION_FILE)`" ; then \
+		cp -f $(GITVERSION_FILE_TMP) $(srcdir)/$(GITVERSION_FILE) ; \
 	fi
+	rm -f $(GITVERSION_FILE_TMP) ;
+
+$(GITVERSION_FILE): make_gitversion_h