diff options
| author | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2008-01-17 00:22:44 +0100 |
|---|---|---|
| committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2008-01-17 00:22:44 +0100 |
| commit | 07d1116c3de24a3a049c3d36ae8ec9704e0055c4 (patch) | |
| tree | 797713ddc4ee9024be2cea2263c12f88098c57a6 /pages | |
| parent | 53920ac400a4a062eb90bb1656140e03e19ecd3d (diff) | |
| parent | 880ee6e7feb33daeb94c6a1195c8eb4202a570b0 (diff) | |
| download | vdr-plugin-live-07d1116c3de24a3a049c3d36ae8ec9704e0055c4.tar.gz vdr-plugin-live-07d1116c3de24a3a049c3d36ae8ec9704e0055c4.tar.bz2 | |
Merge branch 'devel'
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/Makefile | 4 | ||||
| -rw-r--r-- | pages/pageelems.ecpp | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pages/Makefile b/pages/Makefile index 11b7ebe..8f718fe 100644 --- a/pages/Makefile +++ b/pages/Makefile @@ -41,10 +41,12 @@ all: libpages.a MAKEDEP = $(CXX) -MM -MG DEPFILE = .dependencies -$(DEPFILE): Makefile $(OBJS:%.o=%.cpp) $(OBJS:%.o=%.ecpp) +$(DEPFILE): Makefile $(OBJS:%.o=%.cpp) $(OBJS:%.o=%.ecpp) @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.cpp) > $@ +ifneq ($(MAKECMDGOALS),clean) -include $(DEPFILE) +endif ### Targets: diff --git a/pages/pageelems.ecpp b/pages/pageelems.ecpp index cd527cd..a2fef4a 100644 --- a/pages/pageelems.ecpp +++ b/pages/pageelems.ecpp @@ -9,6 +9,7 @@ #include "timers.h" #include "tools.h" #include "epg_events.h" +#include "gen_version_suffix.h" using namespace std; using namespace vdrlive; @@ -334,7 +335,7 @@ int update_status(1); <div class="about_right">Michael Brückner (skiller2k1)</div> <div class="about_head"><div><div><$ tr("Information") $></div></div></div> <div class="about_left"><$ tr("LIVE version") $>:</div> - <div class="about_right"><$ LIVEVERSION $><$ VERSION_SUFFIX $></div> + <div class="about_right"><$ LIVEVERSION $><$ #VERSION_SUFFIX $></div> <div class="about_left"><$ tr("VDR version") $>:</div> <div class="about_right"><$ VDRVERSION $></div> <div class="about_head"><div><div><$ tr("Features") $></div></div></div> |