From 880c3ddb94c09d6cca411363ed6f981d4e150fd2 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sun, 23 Apr 2006 18:00:00 +0200 Subject: =?UTF-8?q?Version=201.3.48=20-=20Updated=20the=20GPL=20copies=20(?= =?UTF-8?q?thanks=20to=20Ville=20Skytt=C3=A4).=20-=20Fixed=20several=20spe?= =?UTF-8?q?lling=20errors=20(thanks=20to=20Ville=20Skytt=C3=A4).=20-=20Upd?= =?UTF-8?q?ated=20the=20Polish=20OSD=20texts=20(thanks=20to=20Jaroslaw=20S?= =?UTF-8?q?wierczynski).=20-=20Updated=20the=20Finnish=20OSD=20texts=20(th?= =?UTF-8?q?anks=20to=20Rolf=20Ahrenberg).=20-=20Updated=20the=20French=20O?= =?UTF-8?q?SD=20texts=20(thanks=20to=20Pierre=20Briec).=20-=20Updated=20th?= =?UTF-8?q?e=20Estonian=20OSD=20texts=20(thanks=20to=20Arthur=20Konovalov)?= =?UTF-8?q?.=20-=20Updated=20the=20Romanian=20OSD=20texts=20(thanks=20to?= =?UTF-8?q?=20Lucian=20Muresan).=20-=20Updated=20the=20Danish=20OSD=20text?= =?UTF-8?q?s=20(thanks=20to=20Mogens=20Elneff).=20-=20Updated=20the=20Russ?= =?UTF-8?q?ian=20OSD=20texts=20(thanks=20to=20Oleg=20Roitburd).=20-=20Upda?= =?UTF-8?q?ted=20the=20Slovenian=20OSD=20texts=20(thanks=20to=20Matjaz=20T?= =?UTF-8?q?haler).=20-=20Fixed=20wrong=20credits=20for=20the=20patch=20tha?= =?UTF-8?q?t=20was=20used=20to=20implement=20cPlugin::Active().=20-=20Simp?= =?UTF-8?q?lified=20the=20'grep|awk|sed'=20command=20to=20retrieve=20the?= =?UTF-8?q?=20VDR/APIVERSION=20to=20a=20single=20=20=20'sed'=20call.=20-?= =?UTF-8?q?=20Updated=20the=20Swedish=20OSD=20texts=20(thanks=20to=20Tomas?= =?UTF-8?q?=20Prybil).=20-=20Modified=20the=20German=20OSD=20texts=20to=20?= =?UTF-8?q?be=20"less=20technical"=20(thanks=20to=20Andreas=20Brachold).?= =?UTF-8?q?=20-=20Extended=20the=20version=20number=20reported=20with=20th?= =?UTF-8?q?e=20'-V'=20option=20to=20also=20show=20the=20=20=20current=20AP?= =?UTF-8?q?IVERSION=20(suggested=20by=20Thomas=20G=C3=BCnther).=20-=20Fixe?= =?UTF-8?q?d=20handling=20empty=20titles=20in=20cEvent::FixEpgBugs()=20(re?= =?UTF-8?q?ported=20by=20Rolf=20Ahrenberg).=20-=20Fixed=20some=20missing?= =?UTF-8?q?=20'-'=20in=20the=20German=20OSD=20texts=20(thanks=20to=20Walte?= =?UTF-8?q?r=20Koch).=20-=20Added=20an=20error=20message=20about=20plugins?= =?UTF-8?q?=20that=20don't=20honor=20APIVERSION=20in=20their=20Makefile=20?= =?UTF-8?q?=20=20(based=20on=20a=20suggestion=20by=20Udo=20Richter).=20-?= =?UTF-8?q?=20Fixed=20a=20format=20string=20in=20recording.c=20to=20avoid?= =?UTF-8?q?=20a=20compiler=20warning=20on=2064bit=20systems=20=20=20(thank?= =?UTF-8?q?s=20to=20Christian=20Wieninger=20for=20reporting,=20and=20Werne?= =?UTF-8?q?r=20Schweer=20for=20pointing=20out=20=20=20that=20the=20'z'=20m?= =?UTF-8?q?odifier=20should=20be=20used=20here).=20-=20Ignoring=20k=5FRepe?= =?UTF-8?q?at=20when=20deciding=20whether=20the=20same=20key=20has=20been?= =?UTF-8?q?=20pressed=20in=20string=20=20=20input=20fields=20(based=20on?= =?UTF-8?q?=20a=20patch=20from=20Marko=20M=C3=A4kel=C3=A4).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Makefile | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f586213..f671fb4 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.87 2006/04/16 09:00:30 kls Exp $ +# $Id: Makefile 1.89 2006/04/23 09:01:17 kls Exp $ .DELETE_ON_ERROR: @@ -81,8 +81,8 @@ DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\" # The version numbers of VDR and the plugin API (taken from VDR's "config.h"): -VDRVERSION = $(shell grep 'define VDRVERSION ' config.h | awk '{ print $$3 }' | sed -e 's/"//g') -APIVERSION = $(shell grep 'define APIVERSION ' config.h | awk '{ print $$3 }' | sed -e 's/"//g') +VDRVERSION = $(shell sed -ne '/define VDRVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' config.h) +APIVERSION = $(shell sed -ne '/define APIVERSION/ { s/^.*"\(.*\)".*$$/\1/; p }' config.h) ifdef VFAT # for people who want their video directory on a VFAT partition @@ -176,10 +176,17 @@ include-dir: plugins: include-dir @failed="";\ + @noapiv="";\ for i in `ls $(PLUGINDIR)/src | grep -v '[^a-z0-9]'`; do\ echo "Plugin $$i:";\ + if ! grep -q "\$$(LIBDIR)/.*\$$(APIVERSION)" "$(PLUGINDIR)/src/$$i/Makefile" ; then\ + echo "ERROR: plugin $$i doesn't honor APIVERSION - not compiled!";\ + noapiv="$$noapiv $$i";\ + continue;\ + fi;\ $(MAKE) -C "$(PLUGINDIR)/src/$$i" all || failed="$$failed $$i";\ done;\ + if [ -n "$$noapiv" ] ; then echo; echo "*** plugins without APIVERSION:$$noapiv"; echo; fi;\ if [ -n "$$failed" ] ; then echo; echo "*** failed plugins:$$failed"; echo; fi clean-plugins: -- cgit v1.2.3