[vdr] Re: new DVD plugin version released

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

Hi,

On Wednesday 09 October 2002 18:46, Andreas Schultz wrote:

[...]

> yeah, i was also not sure about that, i'll give it some more thought ...

ok, here is the simple version that doesn't break thinks.
Make.config now allows one to set the old make options, override DVBDIR with 
an absolute path and also to replace CC, CFLAGS, CXX and CXXFLAGS globaly.

Everything else should work as it used to.

Andreas

diff -Nru a/Makefile b/Makefile
--- a/Makefile	Wed Oct  9 19:12:32 2002
+++ b/Makefile	Wed Oct  9 19:12:32 2002
@@ -23,6 +23,8 @@
 
 VIDEODIR = /video
 
+-include Make.config
+
 ifdef NEWSTRUCT
 INCLUDES = -I$(DVBDIR)/include
 DEFINES += -DNEWSTRUCT
diff -Nru a/PLUGINS/SRC/hello/Makefile b/PLUGINS/SRC/hello/Makefile
--- a/PLUGINS/SRC/hello/Makefile	Wed Oct  9 19:12:32 2002
+++ b/PLUGINS/SRC/hello/Makefile	Wed Oct  9 19:12:32 2002
@@ -13,19 +13,29 @@
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ 
print $$6 }' | sed -e 's/[";]//g')
 
+### The C++ compiler and options:
+
+CXX      = g++
+CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+
 ### The directory environment:
 
-ifdef NEWSTRUCT
-DVBDIR = ../../../../DVB/include
-DEFINES += -DNEWSTRUCT
-else
-DVBDIR = ../../../../DVB/ost/include
-endif
+DVBDIR   = ../../../../DVB
+
+-include ../../../Make.config
+
 VDRDIR = ../../..
 VDRINC = $(VDRDIR)/include
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+ifdef NEWSTRUCT
+INCLUDES = -I$(DVBDIR)/include
+DEFINES += -DNEWSTRUCT
+else
+INCLUDES = -I$(DVBDIR)/ost/include
+endif
+
 ### The version number of VDR (taken from VDR's "config.h"):
 
 VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ 
print $$3 }' | sed -e 's/"//g')
@@ -37,18 +47,13 @@
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES = -I$(VDRINC) -I$(DVBDIR)
+INCLUDES += -I$(VDRINC) 
 
 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 19:12:32 2002
+++ b/PLUGINS/SRC/status/Makefile	Wed Oct  9 19:12:32 2002
@@ -13,19 +13,29 @@
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ 
print $$6 }' | sed -e 's/[";]//g')
 
+### The C++ compiler and options:
+
+CXX      = g++
+CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+
 ### The directory environment:
 
-ifdef NEWSTRUCT
-DVBDIR = ../../../../DVB/include
-DEFINES += -DNEWSTRUCT
-else
-DVBDIR = ../../../../DVB/ost/include
-endif
+DVBDIR   = ../../../../DVB
+
+-include ../../../Make.config
+
 VDRDIR = ../../..
 VDRINC = $(VDRDIR)/include
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+ifdef NEWSTRUCT
+INCLUDES = -I$(DVBDIR)/include
+DEFINES += -DNEWSTRUCT
+else
+INCLUDES = -I$(DVBDIR)/ost/include
+endif
+
 ### The version number of VDR (taken from VDR's "config.h"):
 
 VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ 
print $$3 }' | sed -e 's/"//g')
@@ -37,18 +47,13 @@
 
 ### Includes and Defines (add further entries here):
 
-INCLUDES = -I$(VDRINC) -I$(DVBDIR)
+INCLUDES += -I$(VDRINC)
 
 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.