[ekiga/gnome-2-26] Remove the warning of git revision checking if not in a git repository
- From: Eugen Dedu <ededu src gnome org>
- To: svn-commits-list gnome org
- Subject: [ekiga/gnome-2-26] Remove the warning of git revision checking if not in a git repository
- Date: Fri, 1 May 2009 04:52:44 -0400 (EDT)
commit b6e5865df0b192cf12f99065fea46f651a1ba1b9
Author: Michael Rickmann <mrickma gwdg de>
Date: Fri May 1 10:50:43 2009 +0200
Remove the warning of git revision checking if not in a git repository
---
src/Makefile.am | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index 5dc2e8b..6614ffe 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -137,11 +137,11 @@ endif
.rc.o:
$(LIBTOOL) --tag=RC --mode=compile $(RC) $< -o $@ -I $(top_srcdir)
-GIT_REVISION=\"$(shell (cd ../.git; git describe ))\"
-CACHED_REVISION=$(shell cat revision.h 2>/dev/null | cut -c24-)
+GIT_REVISION=\"$$(cd ../.git; git describe )\"
+CACHED_REVISION=$$(cat revision.h 2>/dev/null | cut -c24-)
src/revision.h:
-$(shell if test -d "../.git" -a -n "$$(which git)"; then \
+ if test -d "../.git" -a -n "$$(which git)"; then \
if test "x$(GIT_REVISION)" != "x$(CACHED_REVISION)"; then \
echo "#define EKIGA_REVISION $(GIT_REVISION)" > revision.h; \
fi \
@@ -149,7 +149,7 @@ $(shell if test -d "../.git" -a -n "$$(which git)"; then \
if !(test -e "./revision.h"); then\
echo "#define EKIGA_REVISION \"unknown\"" > revision.h; \
fi \
- fi)
+ fi
AM_CXXFLAGS = $(GTK_CFLAGS) $(GLIB_CFLAGS) $(GNOME_CFLAGS) $(DBUS_CFLAGS) $(BONOBO_CFLAGS) $(OPAL_CFLAGS) $(PTLIB_CFLAGS) $(SIGC_CFLAGS) $(XML_CFLAGS) $(NOTIFY_CFLAGS)
AM_LIBS = $(GTK_LIBS) $(GLIB_LIBS) $(GNOME_LIBS) $(DBUS_LIBS) $(BONOBO_LIBS) $(OPAL_LIBS) $(PTLIB_LIBS) $(SIGC_LIBS) $(XML_LIBS) $(NOTIFY_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]