From a551b5b124c9c67227f7fde9f3f7e27ee2bd441a Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Wed, 15 Aug 2007 13:20:04 +0200 Subject: [PATCH] Moved the "all" target in plugin Makefiles before the "Implicit rules" --- CONTRIBUTORS | 2 ++ HISTORY | 4 ++++ PLUGINS/src/hello/HISTORY | 5 +++++ PLUGINS/src/hello/Makefile | 8 +++++--- PLUGINS/src/hello/hello.c | 4 ++-- PLUGINS/src/osddemo/HISTORY | 5 +++++ PLUGINS/src/osddemo/Makefile | 8 +++++--- PLUGINS/src/osddemo/osddemo.c | 4 ++-- PLUGINS/src/servicedemo/HISTORY | 5 +++++ PLUGINS/src/servicedemo/Makefile | 8 +++++--- PLUGINS/src/servicedemo/svccli.c | 4 ++-- PLUGINS/src/servicedemo/svcsvr.c | 4 ++-- PLUGINS/src/skincurses/HISTORY | 5 +++++ PLUGINS/src/skincurses/Makefile | 8 +++++--- PLUGINS/src/skincurses/skincurses.c | 4 ++-- PLUGINS/src/sky/HISTORY | 5 +++++ PLUGINS/src/sky/Makefile | 8 +++++--- PLUGINS/src/sky/sky.c | 4 ++-- PLUGINS/src/status/HISTORY | 5 +++++ PLUGINS/src/status/Makefile | 8 +++++--- PLUGINS/src/status/status.c | 4 ++-- PLUGINS/src/svdrpdemo/HISTORY | 5 +++++ PLUGINS/src/svdrpdemo/Makefile | 8 +++++--- PLUGINS/src/svdrpdemo/svdrpdemo.c | 4 ++-- newplugin | 8 +++++--- 25 files changed, 97 insertions(+), 40 deletions(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 764f253b..2211870f 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -2086,6 +2086,8 @@ Matthias Schwarzott for suggesting to add LC_ALL to the checks for UTF-8 at startup for fixing getting the code setting from the locale for improving i18n-to-gettext.pl + for suggesting to move the "all" target in plugin Makefiles before the + "Implicit rules", so that a plain "make" will compile everything Martin Ostermann for fixing processing the PDCDescriptor in 'libsi' on big endian systems diff --git a/HISTORY b/HISTORY index eacebfc5..f60c0a37 100644 --- a/HISTORY +++ b/HISTORY @@ -5352,3 +5352,7 @@ Video Disk Recorder Revision History by Joachim Wilke). - Fixed a faulty comment in Make.config.template (reported by Marco Schlüßler). - Improved i18n-to-gettext.pl (thanks to Matthias Schwarzott). +- Moved the "all" target in plugin Makefiles before the "Implicit rules", + so that a plain "make" will compile everything (suggested by Matthias + Schwarzott). The "newplugin" script has been changed accordingly. + Plugin authors may want to change their Makefiles, too. diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY index 2d770b88..d4c9d378 100644 --- a/PLUGINS/src/hello/HISTORY +++ b/PLUGINS/src/hello/HISTORY @@ -53,3 +53,8 @@ VDR Plugin 'hello' Revision History 2007-08-11: Version 0.2.0 - Switched to 'gettext' internationalization. + +2007-08-15: Version 0.2.1 + +- Moved the "all" target in the Makefile before the "Implicit rules", + so that a plain "make" will compile everything. diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile index e78b6e1a..389d1e04 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.16 2007/08/11 10:18:16 kls Exp $ +# $Id: Makefile 1.17 2007/08/15 13:04:37 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -49,6 +49,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' OBJS = $(PLUGIN).o +### The main target: + +all: libvdr-$(PLUGIN).so i18n + ### Implicit rules: %.o: %.c @@ -90,8 +94,6 @@ i18n: $(I18Nmo) ### Targets: -all: libvdr-$(PLUGIN).so i18n - libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c index 96403389..273217e0 100644 --- a/PLUGINS/src/hello/hello.c +++ b/PLUGINS/src/hello/hello.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: hello.c 1.13 2007/08/11 09:31:17 kls Exp $ + * $Id: hello.c 1.14 2007/08/15 13:17:16 kls Exp $ */ #include @@ -12,7 +12,7 @@ #include #include -static const char *VERSION = "0.2.0"; +static const char *VERSION = "0.2.1"; static const char *DESCRIPTION = trNOOP("A friendly greeting"); static const char *MAINMENUENTRY = trNOOP("Hello"); diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY index fd10cc3c..b0f300a4 100644 --- a/PLUGINS/src/osddemo/HISTORY +++ b/PLUGINS/src/osddemo/HISTORY @@ -12,3 +12,8 @@ VDR Plugin 'osddemo' Revision History 2004-04-30: Version 0.1.1 - New OSD handling. + +2007-08-15: Version 0.1.2 + +- Moved the "all" target in the Makefile before the "Implicit rules", + so that a plain "make" will compile everything. diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile index 71638887..568faa67 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.9 2006/09/09 12:38:35 kls Exp $ +# $Id: Makefile 1.10 2007/08/15 13:05:24 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' OBJS = $(PLUGIN).o +### The main target: + +all: libvdr-$(PLUGIN).so + ### Implicit rules: %.o: %.c @@ -63,8 +67,6 @@ $(DEPFILE): Makefile ### Targets: -all: libvdr-$(PLUGIN).so - libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c index 08b2d967..a4c0b8f8 100644 --- a/PLUGINS/src/osddemo/osddemo.c +++ b/PLUGINS/src/osddemo/osddemo.c @@ -3,12 +3,12 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: osddemo.c 1.3 2004/05/16 09:28:51 kls Exp $ + * $Id: osddemo.c 1.4 2007/08/15 13:17:55 kls Exp $ */ #include -static const char *VERSION = "0.1.1"; +static const char *VERSION = "0.1.2"; static const char *DESCRIPTION = "Demo of arbitrary OSD setup"; static const char *MAINMENUENTRY = "Osd Demo"; diff --git a/PLUGINS/src/servicedemo/HISTORY b/PLUGINS/src/servicedemo/HISTORY index 16a0c430..76d95a5c 100644 --- a/PLUGINS/src/servicedemo/HISTORY +++ b/PLUGINS/src/servicedemo/HISTORY @@ -4,3 +4,8 @@ VDR Plugin 'servicedemo' Revision History 2005-08-21: Version 0.1.1 - Initial revision. + +2007-08-15: Version 0.1.2 + +- Moved the "all" target in the Makefile before the "Implicit rules", + so that a plain "make" will compile everything. diff --git a/PLUGINS/src/servicedemo/Makefile b/PLUGINS/src/servicedemo/Makefile index a18f9950..9625953f 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.8 2006/09/09 12:38:35 kls Exp $ +# $Id: Makefile 1.9 2007/08/15 13:05:42 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -49,6 +49,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' OBJS = $(PLUGIN1).o $(PLUGIN2).o +### The main target: + +all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so + ### Implicit rules: %.o: %.c @@ -65,8 +69,6 @@ $(DEPFILE): Makefile ### Targets: -all: libvdr-$(PLUGIN1).so libvdr-$(PLUGIN2).so - libvdr-$(PLUGIN1).so: $(PLUGIN1).o $(CXX) $(CXXFLAGS) -shared $(PLUGIN1).o -o $@ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) diff --git a/PLUGINS/src/servicedemo/svccli.c b/PLUGINS/src/servicedemo/svccli.c index 9a4ed444..6e812b41 100644 --- a/PLUGINS/src/servicedemo/svccli.c +++ b/PLUGINS/src/servicedemo/svccli.c @@ -3,14 +3,14 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: svccli.c 1.1 2005/08/21 10:44:29 kls Exp $ + * $Id: svccli.c 1.2 2007/08/15 13:18:08 kls Exp $ */ #include #include #include -static const char *VERSION = "0.1.1"; +static const char *VERSION = "0.1.2"; static const char *DESCRIPTION = "Service demo client"; static const char *MAINMENUENTRY = "Service demo"; diff --git a/PLUGINS/src/servicedemo/svcsvr.c b/PLUGINS/src/servicedemo/svcsvr.c index 7aff2b98..9ccb73ce 100644 --- a/PLUGINS/src/servicedemo/svcsvr.c +++ b/PLUGINS/src/servicedemo/svcsvr.c @@ -3,14 +3,14 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: svcsvr.c 1.1 2005/08/21 10:44:24 kls Exp $ + * $Id: svcsvr.c 1.2 2007/08/15 13:18:59 kls Exp $ */ #include #include #include -static const char *VERSION = "0.1.1"; +static const char *VERSION = "0.1.2"; static const char *DESCRIPTION = "Service demo server"; class cPluginSvcSvr : public cPlugin { diff --git a/PLUGINS/src/skincurses/HISTORY b/PLUGINS/src/skincurses/HISTORY index 60f4839e..3d7eed42 100644 --- a/PLUGINS/src/skincurses/HISTORY +++ b/PLUGINS/src/skincurses/HISTORY @@ -51,3 +51,8 @@ VDR Plugin 'skincurses' Revision History 2007-07-20: Version 0.1.2 - Fixed clearing color buttons. + +2007-08-15: Version 0.1.3 + +- Moved the "all" target in the Makefile before the "Implicit rules", + so that a plain "make" will compile everything. diff --git a/PLUGINS/src/skincurses/Makefile b/PLUGINS/src/skincurses/Makefile index 9ab37cee..0534eb57 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.8 2007/06/15 12:23:00 kls Exp $ +# $Id: Makefile 1.9 2007/08/15 13:05:54 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' OBJS = $(PLUGIN).o +### The main target: + +all: libvdr-$(PLUGIN).so + ### Implicit rules: %.o: %.c @@ -63,8 +67,6 @@ $(DEPFILE): Makefile ### Targets: -all: libvdr-$(PLUGIN).so - libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -lncursesw -o $@ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) diff --git a/PLUGINS/src/skincurses/skincurses.c b/PLUGINS/src/skincurses/skincurses.c index 9324210c..148d12ca 100644 --- a/PLUGINS/src/skincurses/skincurses.c +++ b/PLUGINS/src/skincurses/skincurses.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: skincurses.c 1.15 2007/07/20 14:45:07 kls Exp $ + * $Id: skincurses.c 1.16 2007/08/15 13:19:05 kls Exp $ */ #include @@ -11,7 +11,7 @@ #include #include -static const char *VERSION = "0.1.2"; +static const char *VERSION = "0.1.3"; static const char *DESCRIPTION = "A text only skin"; static const char *MAINMENUENTRY = NULL; diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY index 3233bf62..b089c4a1 100644 --- a/PLUGINS/src/sky/HISTORY +++ b/PLUGINS/src/sky/HISTORY @@ -54,3 +54,8 @@ VDR Plugin 'sky' Revision History use the new option -U of getskyepg.pl to have the information added to the URL as a query string. - The getskyepg.pl script now replaces "&" with "&". + +2007-08-15:Version 0.3.6 + +- Moved the "all" target in the Makefile before the "Implicit rules", + so that a plain "make" will compile everything. diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile index 63a647c4..52a520bc 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.9 2006/09/09 12:38:35 kls Exp $ +# $Id: Makefile 1.10 2007/08/15 13:06:08 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' OBJS = $(PLUGIN).o +### The main target: + +all: libvdr-$(PLUGIN).so + ### Implicit rules: %.o: %.c @@ -63,8 +67,6 @@ $(DEPFILE): Makefile ### Targets: -all: libvdr-$(PLUGIN).so - libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c index 4033bf7b..f2aa0cf8 100644 --- a/PLUGINS/src/sky/sky.c +++ b/PLUGINS/src/sky/sky.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: sky.c 1.13 2006/03/26 09:21:10 kls Exp $ + * $Id: sky.c 1.14 2007/08/15 13:19:24 kls Exp $ */ #include @@ -15,7 +15,7 @@ #include #include -static const char *VERSION = "0.3.5"; +static const char *VERSION = "0.3.6"; static const char *DESCRIPTION = "Sky Digibox interface"; // --- cDigiboxDevice -------------------------------------------------------- diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY index 998e23df..97bc7e2e 100644 --- a/PLUGINS/src/status/HISTORY +++ b/PLUGINS/src/status/HISTORY @@ -35,3 +35,8 @@ VDR Plugin 'status' Revision History 2005-12-31: Version 0.2.0 - API change in cStatus. + +2007-08-15: Version 0.2.1 + +- Moved the "all" target in the Makefile before the "Implicit rules", + so that a plain "make" will compile everything. diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile index 1985ab03..2c66d200 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.13 2006/09/09 12:38:35 kls Exp $ +# $Id: Makefile 1.14 2007/08/15 13:06:17 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' OBJS = $(PLUGIN).o +### The main target: + +all: libvdr-$(PLUGIN).so + ### Implicit rules: %.o: %.c @@ -63,8 +67,6 @@ $(DEPFILE): Makefile ### Targets: -all: libvdr-$(PLUGIN).so - libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c index 71639279..fa5f0d41 100644 --- a/PLUGINS/src/status/status.c +++ b/PLUGINS/src/status/status.c @@ -3,13 +3,13 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: status.c 1.8 2005/12/31 15:19:45 kls Exp $ + * $Id: status.c 1.9 2007/08/15 13:19:44 kls Exp $ */ #include #include -static const char *VERSION = "0.2.0"; +static const char *VERSION = "0.2.1"; static const char *DESCRIPTION = "Status monitor test"; static const char *MAINMENUENTRY = NULL; diff --git a/PLUGINS/src/svdrpdemo/HISTORY b/PLUGINS/src/svdrpdemo/HISTORY index efdc8265..64334684 100644 --- a/PLUGINS/src/svdrpdemo/HISTORY +++ b/PLUGINS/src/svdrpdemo/HISTORY @@ -8,3 +8,8 @@ VDR Plugin 'svdrpdemo' Revision History 2005-08-28: Version 0.0.2 - Removed unused MAINMENUENTRY. + +2007-08-15: Version 0.0.3 + +- Moved the "all" target in the Makefile before the "Implicit rules", + so that a plain "make" will compile everything. diff --git a/PLUGINS/src/svdrpdemo/Makefile b/PLUGINS/src/svdrpdemo/Makefile index 8c0f42e3..a6944469 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.7 2006/09/09 12:38:35 kls Exp $ +# $Id: Makefile 1.8 2007/08/15 13:06:28 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -47,6 +47,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' OBJS = $(PLUGIN).o +### The main target: + +all: libvdr-$(PLUGIN).so + ### Implicit rules: %.o: %.c @@ -63,8 +67,6 @@ $(DEPFILE): Makefile ### Targets: -all: libvdr-$(PLUGIN).so - libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ @cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION) diff --git a/PLUGINS/src/svdrpdemo/svdrpdemo.c b/PLUGINS/src/svdrpdemo/svdrpdemo.c index 66dc25b9..008d25b0 100644 --- a/PLUGINS/src/svdrpdemo/svdrpdemo.c +++ b/PLUGINS/src/svdrpdemo/svdrpdemo.c @@ -3,12 +3,12 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: svdrpdemo.c 1.2 2005/08/28 21:11:14 kls Exp $ + * $Id: svdrpdemo.c 1.3 2007/08/15 13:19:57 kls Exp $ */ #include -static const char *VERSION = "0.0.2"; +static const char *VERSION = "0.0.3"; static const char *DESCRIPTION = "How to add SVDRP support to a plugin"; class cPluginSvdrpdemo : public cPlugin { diff --git a/newplugin b/newplugin index c35ae7e6..d3d8287f 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.34 2007/08/12 11:04:39 kls Exp $ +# $Id: newplugin 1.35 2007/08/15 13:05:03 kls Exp $ $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin \n"; @@ -108,6 +108,10 @@ DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"\$(PLUGIN)"' OBJS = \$(PLUGIN).o +### The main target: + +all: libvdr-\$(PLUGIN).so i18n + ### Implicit rules: %.o: %.c @@ -149,8 +153,6 @@ i18n: \$(I18Nmo) ### Targets: -all: libvdr-\$(PLUGIN).so i18n - libvdr-\$(PLUGIN).so: \$(OBJS) \$(CXX) \$(CXXFLAGS) -shared \$(OBJS) -o \$\@ \@cp --remove-destination \$\@ \$(LIBDIR)/\$\@.\$(APIVERSION)