[vdr] Re: new DVD plugin version released

[Andreas Schultz <aschultz+vdr@warp10.net>]

On Wednesday 09 October 2002 14:35, Klaus Schmidinger wrote:

[...]

> Please send a patch that implements this.

Please have a look at the included patch. It introduces Make.config and 
changes the way how parameters are exported to the sub-Makefiles.
Make.config can be used to overwrite the normal config parameters, compile 
flags and directory settings.
However, there is one drawback. It is no longer possible to do a 'make all' in 
a plugin directory to manual build that specific plugin. Retaining that would 
require more complicated rules to get all the path setting right.

Andreas

diff -Nru a/Makefile b/Makefile
--- a/Makefile	Wed Oct  9 17:50:20 2002
+++ b/Makefile	Wed Oct  9 17:50:20 2002
@@ -8,60 +8,72 @@
 
 .DELETE_ON_ERROR:
 
+# configurables
+
 CC       = gcc
 CFLAGS   = -O2
 
 CXX      = g++
 CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
 
-DVBDIR   = ../DVB
-DTVDIR   = ./libdtv
+DVBHOME := $(shell pwd)/../DVB
 MANDIR   = /usr/local/man
 BINDIR   = /usr/local/bin
+VIDEODIR = /video
 
-PLUGINDIR= ./PLUGINS
+-include Make.config
 
-VIDEODIR = /video
+# nothing to configure beyound ###################################
+
+VDRDIR  := $(shell pwd)
 
 ifdef NEWSTRUCT
-INCLUDES = -I$(DVBDIR)/include
+DVBDIR   = -I$(DVBHOME)/include
 DEFINES += -DNEWSTRUCT
 else
-INCLUDES = -I$(DVBDIR)/ost/include
+DVBDIR   = -I$(DVBHOME)/ost/include
 endif
 
-DTVLIB   = $(DTVDIR)/libdtv.a
-
-OBJS = audio.o channels.o config.o cutter.o device.o diseqc.o dvbdevice.o 
dvbosd.o\
-       dvbplayer.o dvbspu.o eit.o eitscan.o font.o i18n.o interface.o keys.o\
-       lirc.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o rcu.o\
-       receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o 
sources.o\
-       spu.o status.o svdrp.o thread.o tools.o transfer.o vdr.o videodir.o
-
-OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
-FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
-
 ifndef REMOTE
 REMOTE = KBD
 endif
 
-ifeq ($(REMOTE), KBD)
-NCURSESLIB = -lncurses
-endif
-
 DEFINES += -DREMOTE_$(REMOTE)
 
 DEFINES += -D_GNU_SOURCE
 
+# for people who want their video directory on a VFAT partition
+ifdef VFAT
+DEFINES += -DVFAT
+endif
+
+export CC CCFLAGS CXX CXXFLAGS DEFINES DVBDIR MANDIR BINDIR VDRDIR
+
+#################################################
+
 ifdef DEBUG_OSD
 DEFINES += -DDEBUG_OSD
 NCURSESLIB = -lncurses
 endif
 
-ifdef VFAT
-# for people who want their video directory on a VFAT partition
-DEFINES += -DVFAT
+ifeq ($(REMOTE), KBD)
+NCURSESLIB = -lncurses
 endif
+
+DTVDIR   = ./libdtv
+PLUGINDIR= ./PLUGINS
+
+DTVLIB   = $(DTVDIR)/libdtv.a
+INCLUDES = $(DVBDIR)
+
+OBJS = audio.o channels.o config.o cutter.o device.o diseqc.o dvbdevice.o 
dvbosd.o\
+       dvbplayer.o dvbspu.o eit.o eitscan.o font.o i18n.o interface.o keys.o\
+       lirc.o menu.o menuitems.o osdbase.o osd.o player.o plugin.o rcu.o\
+       receiver.o recorder.o recording.o remote.o remux.o ringbuffer.o 
sources.o\
+       spu.o status.o svdrp.o thread.o tools.o transfer.o vdr.o videodir.o
+
+OSDFONT = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
+FIXFONT = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
 
 all: vdr
 font: genfontfile fontfix.c fontosd.c
diff -Nru a/PLUGINS/SRC/hello/Makefile b/PLUGINS/SRC/hello/Makefile
--- a/PLUGINS/SRC/hello/Makefile	Wed Oct  9 17:50:20 2002
+++ b/PLUGINS/SRC/hello/Makefile	Wed Oct  9 17:50:20 2002
@@ -15,14 +15,6 @@
 
 ### The directory environment:
 
-ifdef NEWSTRUCT
-DVBDIR = ../../../../DVB/include
-DEFINES += -DNEWSTRUCT
-else
-DVBDIR = ../../../../DVB/ost/include
-endif
-VDRDIR = ../../..
-VDRINC = $(VDRDIR)/include
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
@@ -37,18 +29,13 @@
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES = -I$(VDRINC) -I$(DVBDIR)
+INCLUDES  = -I$(VDRDIR)/include -I$(DVBDIR)
 
-DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES  += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
 OBJS = $(PLUGIN).o i18n.o
-
-### The C++ compiler and options:
-
-CXX      = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
 
 ### Implicit rules:
 
diff -Nru a/PLUGINS/SRC/status/Makefile b/PLUGINS/SRC/status/Makefile
--- a/PLUGINS/SRC/status/Makefile	Wed Oct  9 17:50:20 2002
+++ b/PLUGINS/SRC/status/Makefile	Wed Oct  9 17:50:20 2002
@@ -15,14 +15,6 @@
 
 ### The directory environment:
 
-ifdef NEWSTRUCT
-DVBDIR = ../../../../DVB/include
-DEFINES += -DNEWSTRUCT
-else
-DVBDIR = ../../../../DVB/ost/include
-endif
-VDRDIR = ../../..
-VDRINC = $(VDRDIR)/include
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
@@ -37,18 +29,13 @@
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES = -I$(VDRINC) -I$(DVBDIR)
+INCLUDES = -I$(VDRDIR)/includes -I$(DVBDIR)
 
 DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
 OBJS = $(PLUGIN).o
-
-### The C++ compiler and options:
-
-CXX      = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
 
 ### Implicit rules:
 



--
Info:
To unsubscribe send a mail to listar@linuxtv.org with "unsubscribe vdr" as subject.