summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTORS4
-rw-r--r--HISTORY4
-rw-r--r--Makefile10
3 files changed, 13 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a56a598b..a1f8b1f7 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -791,10 +791,12 @@ Christoph Friederich <christoph.friederich@gmx.de>
for reporting a bug in deleting the last recording in the "Recordings" menu, which
started pausing live video
-Andreas Brachold <andy03@deltab.de>
+Andreas Brachold <vdr04@deltab.de>
for his support in keeping 'channels.conf.terr' up to date
for fixing 'newplugin' and libsi/Makefile to use the compiler defined in $(CXX)
for generating file dependencies
+ for suggesting that the 'plugins-clean' target of the Makefile should only delete
+ the actual plugin library files from this version of VDR
Manuel Hartl <icecep@gmx.net>
for suggesting to extend the logging info when starting/stopping timers
diff --git a/HISTORY b/HISTORY
index 3b132150..a0e123ec 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3374,7 +3374,7 @@ Video Disk Recorder Revision History
out).
- Added MPEG1 replay capability to cPesAssembler (thanks to Stefan Huelswitt).
-2005-02-12: Version 1.3.21
+2005-02-13: Version 1.3.21
- Fixed cDvbDevice::SetAudioTrackDevice() to avoid a blank screen after switching
back to live mode if a recording is currently active on the primary device.
@@ -3406,3 +3406,5 @@ Video Disk Recorder Revision History
Flynt for suggestions and experiments in that area).
- Making sure the first audio packet is not dropped when switching to "pre 1.3.19
Dolby Digital compatibility mode".
+- The 'plugins-clean' target of the Makefile now only deletes the actual plugin
+ library files from this version of VDR (suggested by Andreas Brachold).
diff --git a/Makefile b/Makefile
index f70a2e91..59e7e787 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: Makefile 1.73 2004/12/18 13:39:19 kls Exp $
+# $Id: Makefile 1.74 2005/02/13 10:13:45 kls Exp $
.DELETE_ON_ERROR:
@@ -71,6 +71,10 @@ DEFINES += -D_GNU_SOURCE
DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
+# The version number of VDR (taken from VDR's "config.h"):
+
+VDRVERSION = $(shell grep 'define VDRVERSION ' config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+
ifdef VFAT
# for people who want their video directory on a VFAT partition
DEFINES += -DVFAT
@@ -166,7 +170,7 @@ plugins: include-dir
plugins-clean:
@for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do $(MAKE) -C "$(PLUGINDIR)/src/$$i" clean; done
- @-rm -f $(PLUGINLIBDIR)/*
+ @-rm -f $(PLUGINLIBDIR)/libvdr-*.so.$(VDRVERSION)
# Install the files:
@@ -183,7 +187,7 @@ install:
srcdoc:
@cp $(DOXYFILE) $(DOXYFILE).tmp
- @echo PROJECT_NUMBER = `grep VDRVERSION config.h | awk '{ print $$3 }'` >> $(DOXYFILE).tmp
+ @echo PROJECT_NUMBER = $(VDRVERSION) >> $(DOXYFILE).tmp
$(DOXYGEN) $(DOXYFILE).tmp
@rm $(DOXYFILE).tmp