From 147d600cc824dd509becec454741d077614dc4a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?= Date: Thu, 19 Feb 2015 11:19:10 +0100 Subject: [PATCH] Prevent liblinphone_gitversion.h from cleaning when building the distribution archive --- coreapi/Makefile.am | 16 +++++++--------- gtk/main.c | 2 +- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/coreapi/Makefile.am b/coreapi/Makefile.am index 40a26ccab..116530afa 100644 --- a/coreapi/Makefile.am +++ b/coreapi/Makefile.am @@ -207,15 +207,13 @@ make_gitversion_h: else \ $(ECHO) -n "" > $(builddir)/$(GITVERSION_FILE_TMP) ; \ fi ; \ - else \ - $(ECHO) -n "" > $(builddir)/$(GITVERSION_FILE_TMP) ; \ + if ! test -f $(builddir)/$(GITVERSION_FILE) ; then \ + cp -f $(builddir)/$(GITVERSION_FILE_TMP) $(builddir)/$(GITVERSION_FILE) ; \ + fi ; \ + if test "`cat $(builddir)/$(GITVERSION_FILE_TMP)`" != "`cat $(builddir)/$(GITVERSION_FILE)`" ; then \ + cp -f $(builddir)/$(GITVERSION_FILE_TMP) $(builddir)/$(GITVERSION_FILE) ; \ + fi ; \ + rm -f $(builddir)/$(GITVERSION_FILE_TMP) ; \ fi - if ! test -f $(builddir)/$(GITVERSION_FILE) ; then \ - cp -f $(builddir)/$(GITVERSION_FILE_TMP) $(builddir)/$(GITVERSION_FILE) ; \ - fi - if test "`cat $(builddir)/$(GITVERSION_FILE_TMP)`" != "`cat $(builddir)/$(GITVERSION_FILE)`" ; then \ - cp -f $(builddir)/$(GITVERSION_FILE_TMP) $(builddir)/$(GITVERSION_FILE) ; \ - fi - rm -f $(builddir)/$(GITVERSION_FILE_TMP) ; $(GITVERSION_FILE): make_gitversion_h diff --git a/gtk/main.c b/gtk/main.c index b59c3ea3b..f840435cc 100644 --- a/gtk/main.c +++ b/gtk/main.c @@ -22,6 +22,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "linphone.h" #include "lpconfig.h" +#include "liblinphone_gitversion.h" #include @@ -49,7 +50,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #endif -#include "coreapi/liblinphone_gitversion.h" const char *this_program_ident_string="linphone_ident_string=" LINPHONE_VERSION;