From 2aa6df4b7ceaeef5527a46041bb505b0e638904e Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 10 Sep 2006 14:10:51 +0200 Subject: [PATCH] Added --remove-destination to the 'cp' command for binaries in the Makefiles of the plugins --- CONTRIBUTORS | 2 ++ HISTORY | 5 +++++ PLUGINS/src/hello/Makefile | 4 ++-- PLUGINS/src/osddemo/Makefile | 4 ++-- PLUGINS/src/servicedemo/Makefile | 6 +++--- PLUGINS/src/skincurses/Makefile | 4 ++-- PLUGINS/src/sky/Makefile | 4 ++-- PLUGINS/src/status/Makefile | 4 ++-- PLUGINS/src/svdrpdemo/Makefile | 4 ++-- config.h | 4 ++-- newplugin | 4 ++-- 11 files changed, 26 insertions(+), 19 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 78413683..f9f4b6af 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1006,6 +1006,8 @@ Rolf Ahrenberg for reporting a bug in handling empty titles in cEvent::FixEpgBugs() for suggesting to replace the "Really restart?" prompt in the call to cPluginManager::Active() in menu.c to "restart anyway?" + for adding --remove-destination to the 'cp' command for binaries in the Makefiles of + the plugins Ralf Klueber for reporting a bug in cutting a recording if there is only a single editing mark diff --git a/HISTORY b/HISTORY index 1e4a553d..4b2fc74d 100644 --- a/HISTORY +++ b/HISTORY @@ -4914,3 +4914,8 @@ Video Disk Recorder Revision History to Alexander Rieger). - Implemented a copy constructor for cTimer (thanks to Udo Richter for reporting that an assignment in svdrp.c didn't use the cTimer::operator=()). + +2006-09-09: Version 1.4.2-3 + +- Added --remove-destination to the 'cp' command for binaries in the Makefiles of + the plugins (thanks to Rolf Ahrenberg). diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile index cefc3331..8deaeaa8 100644 --- a/PLUGINS/src/hello/Makefile +++ b/PLUGINS/src/hello/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.14 2006/04/24 17:20:58 kls Exp $ +# $Id: Makefile 1.15 2006/09/09 12:38:35 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ - @cp $@ $(LIBDIR)/$@.$(APIVERSION) + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile index f0b13063..71638887 100644 --- a/PLUGINS/src/osddemo/Makefile +++ b/PLUGINS/src/osddemo/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.8 2006/04/24 17:21:00 kls Exp $ +# $Id: Makefile 1.9 2006/09/09 12:38:35 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ - @cp $@ $(LIBDIR)/$@.$(APIVERSION) + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile index e44af0b1..a18f9950 100644 --- a/PLUGINS/src/servicedemo/Makefile +++ b/PLUGINS/src/servicedemo/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.7 2006/06/24 09:09:54 kls Exp $ +# $Id: Makefile 1.8 2006/09/09 12:38:35 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -69,11 +69,11 @@ all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so libvdr-$(PLUGIN1).so: $(PLUGIN1).o $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@ - @cp $@ $(LIBDIR)/$@.$(APIVERSION) + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) libvdr-$(PLUGIN2).so: $(PLUGIN2).o $(CXX) $(CXXFLAGS) -shared $(PLUGIN2).o -o $@ - @cp $@ $(LIBDIR)/$@.$(APIVERSION) + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile index 05c5e053..4f83614f 100644 --- a/PLUGINS/src/skincurses/Makefile +++ b/PLUGINS/src/skincurses/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.6 2006/04/24 17:21:02 kls Exp $ +# $Id: Makefile 1.7 2006/09/09 12:38:35 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncurses -o $@ - @cp $@ $(LIBDIR)/$@.$(APIVERSION) + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile index 6b43441c..63a647c4 100644 --- a/PLUGINS/src/sky/Makefile +++ b/PLUGINS/src/sky/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.8 2006/04/24 17:21:03 kls Exp $ +# $Id: Makefile 1.9 2006/09/09 12:38:35 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ - @cp $@ $(LIBDIR)/$@.$(APIVERSION) + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile index 8cca7596..1985ab03 100644 --- a/PLUGINS/src/status/Makefile +++ b/PLUGINS/src/status/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.12 2006/04/24 17:21:04 kls Exp $ +# $Id: Makefile 1.13 2006/09/09 12:38:35 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ - @cp $@ $(LIBDIR)/$@.$(APIVERSION) + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile index a191d513..8c0f42e3 100644 --- a/PLUGINS/src/svdrpdemo/Makefile +++ b/PLUGINS/src/svdrpdemo/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.6 2006/04/24 17:21:06 kls Exp $ +# $Id: Makefile 1.7 2006/09/09 12:38:35 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -67,7 +67,7 @@ all: libvdr-$(PLUGIN).so libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ - @cp $@ $(LIBDIR)/$@.$(APIVERSION) + @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) diff --git a/config.h b/config.h index 8e3ec8d0..ad0e4a78 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: config.h 1.269 2006/09/04 17:44:12 kls Exp $ + * $Id: config.h 1.270 2006/09/10 14:09:31 kls Exp $ */ #ifndef __CONFIG_H @@ -21,7 +21,7 @@ // VDR's own version number: -#define VDRVERSION "1.4.2-2" +#define VDRVERSION "1.4.2-3" #define VDRVERSNUM 10402 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: diff --git a/newplugin b/newplugin index dd491405..363baae4 100755 --- a/newplugin +++ b/newplugin @@ -12,7 +12,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: newplugin 1.29 2006/06/24 09:15:17 kls Exp $ +# $Id: newplugin 1.30 2006/09/09 12:38:35 kls Exp $ $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin \n"; @@ -124,7 +124,7 @@ all: libvdr-\$(PLUGIN).so libvdr-\$(PLUGIN).so: \$(OBJS) \$(CXX) \$(CXXFLAGS) -shared \$(OBJS) -o \$\@ - \@cp \$\@ \$(LIBDIR)/\$\@.\$(APIVERSION) + \@cp --remove-destination \$\@ \$(LIBDIR)/\$\@.\$(APIVERSION) dist: clean \@-rm -rf \$(TMPDIR)/\$(ARCHIVE)