From: Andreas Oberritter Date: Sun, 5 Dec 2010 02:59:56 +0000 (+0100) Subject: Merge branch 'obi/master' into experimental X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=13fa6a99a041ecae345d3a3f5e4ace9d23815a8a;hp=fb6ff3b0e154f65d63defaf259069b13ef1eb039 Merge branch 'obi/master' into experimental --- diff --git a/main/Makefile.am b/main/Makefile.am index 0ed4d71..137ddab 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -74,6 +74,9 @@ version-intermediate.h: $(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 +else +version.h: + $(AM_V_GEN)touch $@ endif enigma2$(EXEEXT): $(enigma2_OBJECTS) $(enigma2_DEPENDENCIES) $(enigma2_LDADD_WHOLE)