Merge branch 'obi/master' into experimental

[enigma2.git] / main / Makefile.am

diff --git a/main/Makefile.am b/main/Makefile.am
index 06e6e920add50d1c6447496ecd452072d4ac0b7b..c4513e91326fad41507d1ec3a0f396ca00138e80 100644 (file)
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -16,7 +16,7 @@ enigma2_SOURCES = \
        xmlgenerator.cpp \
        xmlgenerator.h \
        version_info.cpp \
-       version_info.h
+       version_info.h \
        version.h
 
 EXTRA_DIST = \
@@ -60,21 +60,21 @@ if HAVE_FAKE_GIT_DIR
 ENIGMA2_DATE = `cat $(GIT_DIR)/last_commit_info | grep 'Date:' | cut -d' ' -f4`
 ENIGMA2_BRANCH = `cat $(GIT_DIR)/branch`
 else
-ENIGMA2_DATE = `$(GIT) log --no-color -n 1 --format=format:%cd --date=short`
+ENIGMA2_DATE = `$(GIT) log --no-color -n 1 --pretty=format:%cd --date=short`
 ENIGMA2_BRANCH = `$(GIT) branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`
-ENIGMA2_REV = `$(GIT) describe --abbrev=7 --always --dirty --long --tags`
+ENIGMA2_REV = `$(GIT) describe --abbrev=7 --always --long --tags`
+endif
 endif
 
 BUILT_SOURCES = version-intermediate.h
-CLEANFILES = version-intermediate.h
+.INTERMEDIATE: version-intermediate.h
+.PHONY: version-intermediate.h
 version-intermediate.h:
        $(AM_V_GEN)touch $@
-       $(AM_V_at)[ -n "$(ENIGMA2_DATE)" ] && echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_DATE)\"" >> $@
-       $(AM_V_at)[ -n "$(ENIGMA2_BRANCH)" ] && echo "#define ENIGMA2_BRANCH \"$(ENIGMA2_BRANCH)\"" >> $@
-       $(AM_V_at)[ -n "$(ENIGMA2_REV)" ] && echo "#define ENIGMA2_REV \"$(ENIGMA2_REV)\"" >> $@
+       -$(AM_V_at)[ -n "$(ENIGMA2_DATE)" ] && echo "#define ENIGMA2_LAST_CHANGE_DATE \"$(ENIGMA2_DATE)\"" >> $@
+       -$(AM_V_at)[ -n "$(ENIGMA2_BRANCH)" ] && echo "#define ENIGMA2_BRANCH \"$(ENIGMA2_BRANCH)\"" >> $@
+       -$(AM_V_at)[ -n "$(ENIGMA2_REV)" ] && echo "#define ENIGMA2_REV \"$(ENIGMA2_REV)\"" >> $@
        $(AM_V_at)([ -f version.h ] && diff -q version.h $@ >/dev/null) || $(INSTALL_HEADER) $@ version.h
-       $(AM_V_at)$(RM) $@
-endif
 
 enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)
        $(AM_V_CXXLD)$(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ $(enigma2_LDFLAGS) $(enigma2_OBJECTS) \