From 47a981960f1d0b6d0d8cbe3bdc15f2b9e8665731 Mon Sep 17 00:00:00 2001
From: Martin Prochnow <nordlicht@martins-kabuff.de>
Date: Tue, 2 May 2006 19:11:38 +0200
Subject: =?UTF-8?q?Version=200.10=20-=20made=20changes=20to=20Makefile=20f?=
 =?UTF-8?q?or=20APIVERSION=20(VDR=20>=3D=201.3.47)=20-=20changed=20myRepla?=
 =?UTF-8?q?yControl;=20suggested=20by=20Thomas=20G=FCnther=20-=20added=20d?=
 =?UTF-8?q?isplay=20of=20free=20disk=20space=20to=20the=20title=20bar=20-?=
 =?UTF-8?q?=20fixed=20adjustments=20for=20BigPatch/CmdSubMenu-patch;=20tha?=
 =?UTF-8?q?nks=20to=20Thomas=20G=FCnther=20for=20the=20patch=20-=20renamin?=
 =?UTF-8?q?g/moving=20directories=20is=20now=20possible=20-=20fixed=20esca?=
 =?UTF-8?q?ping=20of=20parameters=20for=20dvdarchive.sh=20-=20changed=20be?=
 =?UTF-8?q?haviour=20if=20the=20replay=20of=20a=20recording=20ends,=20plug?=
 =?UTF-8?q?ins=20will=20not=20open=20-=20'Play'=20and=20'Menu'->'Blue'=20f?=
 =?UTF-8?q?or=20resuming=20a=20replay=20work=20now;=20BUT:=20the=20replay?=
 =?UTF-8?q?=20isn't=20done=20with=20the=20plugin=20if=20you=20start=20repl?=
 =?UTF-8?q?aying=20this=20way,=20means=20if=20you=20stop=20the=20replay=20?=
 =?UTF-8?q?you=20come=20to=20VDR's=20recordings=20menu=20-=20switched=20of?=
 =?UTF-8?q?f=20editing=20of=20details=20(priority=20and=20lifetime)=20or?=
 =?UTF-8?q?=20archive=20dvd=20recordings=20to=20avoid=20trouble=20with=20t?=
 =?UTF-8?q?he=20dir=20name=20that=20identifies=20it=20on=20the=20media=20-?=
 =?UTF-8?q?=20added=20option=20to=20mark=20last=20replayed=20recording=20w?=
 =?UTF-8?q?hile=20opening=20the=20plugin=20-=20added=20possibilty=20to=20i?=
 =?UTF-8?q?nclude=20video=20dvd's=20into=20the=20recordings=20hierarchy;?=
 =?UTF-8?q?=20see=20README=20-=20introduced=20new=20parameters=20for=20the?=
 =?UTF-8?q?=20'-r'-option=20if=20VDR:=20move,=20rename=20and=20delete?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index af730f8..1a99ded 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
 
 ### The directory environment:
 
-DVBDIR = ../../../../DVB
 VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
@@ -29,9 +28,9 @@ TMPDIR = /tmp
 
 -include $(VDRDIR)/Make.config
 
-### The version number of VDR (taken from VDR's "config.h"):
+### The version number of VDR / VDR's plugin API (taken from VDR's "config.h"):
 
-VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
 
 ### The name of the distribution archive:
 
@@ -40,13 +39,13 @@ PACKAGE = vdr-$(ARCHIVE)
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include
+INCLUDES += -I$(VDRDIR)/include
 
 DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
-OBJS = $(PLUGIN).o mymenurecordings.o myreplaycontrol.o i18n.o mymenurecordinginfo.o \
+OBJS = $(PLUGIN).o mymenurecordings.o myreplaycontrol.o i18n.o \
        mymenusetup.o mymenucommands.o patchfont.o tools.o mymenueditrecording.o
 
 ### Implicit rules:
@@ -69,7 +68,7 @@ all: libvdr-$(PLUGIN).so
 
 libvdr-$(PLUGIN).so: $(OBJS)
 	$(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
-	@cp $@ $(LIBDIR)/$@.$(VDRVERSION)
+	@cp $@ $(LIBDIR)/$@.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-- 
cgit v1.2.3