From 830d86017a8f510272574f38aa9f159a3b9acc26 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 24 Jun 2006 09:15:17 +0200 Subject: [PATCH] Fixed the Makefile of the 'servicedemo' plugin, so that it defines the PLUGIN macro; added a comment regarding the PLUGIN macro to the 'newplugin' script --- HISTORY | 9 +++++++++ PLUGINS/src/servicedemo/Makefile | 3 ++- config.h | 4 ++-- newplugin | 4 +++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/HISTORY b/HISTORY index 796f4437..860cb730 100644 --- a/HISTORY +++ b/HISTORY @@ -4801,3 +4801,12 @@ Video Disk Recorder Revision History Patrick Cernko). - Now making sure a VPS timer has a schedule in case the epg.data file didn't contain one when VDR was started. + +2006-06-24: Version 1.4.1-2 + +- Fixed the Makefile of the 'servicedemo' plugin, so that it defines the + PLUGIN macro, which allows the Make.config file to react properly when + compiling the plugin. + Note to all plugin developers: a plugin's Makefile *must* define the PLUGIN + macro, even if it doesn't use it itself! +- Added a comment regarding the PLUGIN macro to the 'newplugin' script. diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile index 08e83c31..e44af0b1 100644 --- a/PLUGINS/src/servicedemo/Makefile +++ b/PLUGINS/src/servicedemo/Makefile @@ -1,12 +1,13 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.6 2006/04/24 17:21:01 kls Exp $ +# $Id: Makefile 1.7 2006/06/24 09:09:54 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. # By default the main source file also carries this name. # +PLUGIN = servicedemo # dummy name for Make.config PLUGIN1 = svccli PLUGIN2 = svcsvr diff --git a/config.h b/config.h index 212c88d2..92a14333 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.261 2006/06/15 09:23:21 kls Exp $ + * $Id: config.h 1.262 2006/06/24 09:08:46 kls Exp $ */ #ifndef __CONFIG_H @@ -21,7 +21,7 @@ // VDR's own version number: -#define VDRVERSION "1.4.1-1" +#define VDRVERSION "1.4.1-2" #define VDRVERSNUM 10401 // Version * 10000 + Major * 100 + Minor // The plugin API's version number: diff --git a/newplugin b/newplugin index 98b8645d..dd491405 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.28 2006/04/24 17:18:41 kls Exp $ +# $Id: newplugin 1.29 2006/06/24 09:15:17 kls Exp $ $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin \n"; @@ -61,6 +61,8 @@ $MAKEFILE = qq # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. # By default the main source file also carries this name. +# IPORTANT: the presence of this macro is important for the Make.config +# file. So it must be defined, even if it is not used here! # PLUGIN = $PLUGIN_NAME