diff options
| author | Andreas Oberritter <obi@opendreambox.org> | 2010-12-05 04:11:57 +0100 |
|---|---|---|
| committer | Andreas Oberritter <obi@opendreambox.org> | 2010-12-05 04:11:57 +0100 |
| commit | 41241f78914d0f06f968973cd67cd7b655f645c8 (patch) | |
| tree | f7eb87e65ec1cdc21af96aa3bab40e025582243d | |
| parent | 13fa6a99a041ecae345d3a3f5e4ace9d23815a8a (diff) | |
| parent | 0fff842a5f2b4185257aadb6b6a3dfa033a91d72 (diff) | |
| download | enigma2-41241f78914d0f06f968973cd67cd7b655f645c8.tar.gz enigma2-41241f78914d0f06f968973cd67cd7b655f645c8.zip | |
Merge branch 'obi/master' into experimental
| -rw-r--r-- | main/Makefile.am | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/main/Makefile.am b/main/Makefile.am index 137ddabc..c4513e91 100644 --- a/main/Makefile.am +++ b/main/Makefile.am @@ -64,20 +64,17 @@ 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 --long --tags` endif +endif BUILT_SOURCES = 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_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 -else -version.h: - $(AM_V_GEN)touch $@ -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) \ |