From: Andreas Oberritter <obi@opendreambox.org>
Date: Tue, 16 Nov 2010 20:15:41 +0000 (+0100)
Subject: version.h: make generation more robust
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=7947bf364b16459db9c68eb4bad60f9051a11763

version.h: make generation more robust

* $(ENIGMA2_REV) may be empty, so prefix the line with '-'
* mark target as intermediate and phony to ensure execution and deletion
---

diff --git a/main/Makefile.am b/main/Makefile.am
index 06e6e92..78fcc6c 100644
--- a/main/Makefile.am
+++ b/main/Makefile.am
@@ -66,14 +66,14 @@ ENIGMA2_REV = `$(GIT) describe --abbrev=7 --always --dirty --long --tags`
 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_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)