frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Removed DVBDIR from Makefile; it's now defined in Make.config if necessary

This commit is contained in:
Klaus Schmidinger 2006-04-15 12:39:35 +02:00
parent b49df33917
commit 12ea50fceb
13 changed files with 40 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -1338,6 +1338,8 @@ Marco Schl
for fixing handling DPID when deciding whether to switch to 'Transfer Mode' for fixing handling DPID when deciding whether to switch to 'Transfer Mode'
for adding VBITeletextDescriptorTag, TeletextDescriptorTag, LocalTimeOffsetDescriptorTag for adding VBITeletextDescriptorTag, TeletextDescriptorTag, LocalTimeOffsetDescriptorTag
and PremiereContentTransmissionDescriptor to 'libsi' and PremiereContentTransmissionDescriptor to 'libsi'
for pointing out that plugins might be compiled with different DVB driver header
files than VDR itself
Jürgen Schmitz <j.schmitz@web.de> Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP for reporting a bug in displaying the current channel when switching via the SVDRP

7
HISTORY
View File

@ -4528,3 +4528,10 @@ Video Disk Recorder Revision History
from Peter Dittmann). See PLUGINS.html for details. from Peter Dittmann). See PLUGINS.html for details.
- Fixed setting the 'Delta' parameter when calling the shutdown script with - Fixed setting the 'Delta' parameter when calling the shutdown script with
no active timer (reported by Helge Lenz). no active timer (reported by Helge Lenz).
- In order to make sure that plugins are compiled with the same DVB driver header
files as VDR itself, the definition of DVBDIR has been removed from the VDR
Makefile. If you are using a driver version that has its header files at a location
other than /usr/include/linux/dvb, you can define DVBDIR in the Make.config
file (see also INSTALL). Any reference to DVBDIR should be removed from all
plugins' Makefiles. Thanks to Marco Schlüßler for pointing out this problem.

17
INSTALL
View File

@ -25,17 +25,12 @@ Compiling and running the program:
VDR requires the Linux-DVB driver header files to compile. VDR requires the Linux-DVB driver header files to compile.
As of kernel 2.6 these are part of the official Linux kernel As of kernel 2.6 these are part of the official Linux kernel
distribution, and VDR's Makefile will automatically locate distribution, and so they should be automatically found in
them. If you are using kernel 2.4 or earlier, you should /usr/include/linux/dvb. If your DVB driver header files are
install the files from this package in a directory that is in a different location, you can rename the file Make.config.template
"parallel" to the DVB directory of the driver source (refer to to Make.config and adjust the definition of DVBDIR in that file.
http://linuxtv.org for more information about that driver).
For example, if the DVB driver was extracted into the directory Refer to http://linuxtv.org for more information about the Linux-DVB driver.
/home/kls/vdr/DVB, then this package should be extracted into
/home/kls/vdr/VDR.
If you have the DVB driver source in a different location
you can rename the file Make.config.template to Make.config and
adjust the definition of DVBDIR in that file.
VDR requires the Linux-DVB driver version dated 2003-08-23 or higher VDR requires the Linux-DVB driver version dated 2003-08-23 or higher
to work properly. to work properly.

10
Make.config.template
View File

@ -6,7 +6,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # how to reach the author.
# #
# $Id: Make.config.template 1.7 2006/01/13 16:06:11 kls Exp $ # $Id: Make.config.template 1.8 2006/04/15 12:28:03 kls Exp $
### The C compiler and options: ### The C compiler and options:
@ -18,7 +18,7 @@ CXXFLAGS = -fPIC -g -O2 -Wall -Woverloaded-virtual
### The directory environment: ### The directory environment:
#DVBDIR = ../DVB #DVBDIR = /usr/src/v4l-dvb/linux
MANDIR = /usr/local/man MANDIR = /usr/local/man
BINDIR = /usr/local/bin BINDIR = /usr/local/bin
@ -33,3 +33,9 @@ RCU_DEVICE = /dev/ttyS1
## Define if you want vdr to not run as root ## Define if you want vdr to not run as root
#VDR_USER = vdr #VDR_USER = vdr
### You don't need to touch the following:
ifdef DVBDIR
INCLUDES += -I$(DVBDIR)/include
endif

14
Makefile
View File

@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # how to reach the author.
# #
# $Id: Makefile 1.85 2006/02/05 13:37:11 kls Exp $ # $Id: Makefile 1.86 2006/04/15 12:24:28 kls Exp $
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
@ -14,16 +14,6 @@ CFLAGS ?= -O2
CXX ?= g++ CXX ?= g++
CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
LINUX_VERSION := $(shell uname -r | cut -c-3)
LINUX := $(shell uname -r)
DVBDIR := /lib/modules/$(LINUX)/build
ifeq ($(LINUX_VERSION), 2.4)
DVBDIR = ../DVB
endif
ifeq ($(LINUX_VERSION), 2.2)
DVBDIR = ../DVB
endif
LSIDIR = ./libsi LSIDIR = ./libsi
MANDIR = /usr/local/man MANDIR = /usr/local/man
BINDIR = /usr/local/bin BINDIR = /usr/local/bin
@ -40,8 +30,6 @@ DOXYFILE = Doxyfile
-include Make.config -include Make.config
INCLUDES += -I$(DVBDIR)/include
SILIB = $(LSIDIR)/libsi.a SILIB = $(LSIDIR)/libsi.a
OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbosd.o\ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbosd.o\

5
PLUGINS/src/hello/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.10 2005/11/11 13:20:14 kls Exp $ # $Id: Makefile 1.11 2006/04/15 11:58:46 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -20,7 +20,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
### The directory environment: ### The directory environment:
DVBDIR = ../../../../DVB
VDRDIR = ../../.. VDRDIR = ../../..
LIBDIR = ../../lib LIBDIR = ../../lib
TMPDIR = /tmp TMPDIR = /tmp
@ -40,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE)
### Includes and Defines (add further entries here): ### 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)"' DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'

5
PLUGINS/src/osddemo/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.4 2005/11/11 13:20:14 kls Exp $ # $Id: Makefile 1.5 2006/04/15 11:59:01 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -20,7 +20,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
### The directory environment: ### The directory environment:
DVBDIR = ../../../../DVB
VDRDIR = ../../.. VDRDIR = ../../..
LIBDIR = ../../lib LIBDIR = ../../lib
TMPDIR = /tmp TMPDIR = /tmp
@ -40,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE)
### Includes and Defines (add further entries here): ### 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)"' DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'

5
PLUGINS/src/servicedemo/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.2 2005/11/11 13:20:14 kls Exp $ # $Id: Makefile 1.3 2006/04/15 11:59:07 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -21,7 +21,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
### The directory environment: ### The directory environment:
DVBDIR = ../../../../DVB
VDRDIR = ../../.. VDRDIR = ../../..
LIBDIR = ../../lib LIBDIR = ../../lib
TMPDIR = /tmp TMPDIR = /tmp
@ -41,7 +40,7 @@ PACKAGE = vdr-$(ARCHIVE)
### Includes and Defines (add further entries here): ### 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)"' DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'

5
PLUGINS/src/skincurses/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.2 2005/11/11 13:20:14 kls Exp $ # $Id: Makefile 1.3 2006/04/15 11:59:12 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -20,7 +20,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
### The directory environment: ### The directory environment:
DVBDIR = ../../../../DVB
VDRDIR = ../../.. VDRDIR = ../../..
LIBDIR = ../../lib LIBDIR = ../../lib
TMPDIR = /tmp TMPDIR = /tmp
@ -40,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE)
### Includes and Defines (add further entries here): ### 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)"' DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'

5
PLUGINS/src/sky/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.4 2005/11/11 13:20:14 kls Exp $ # $Id: Makefile 1.5 2006/04/15 11:59:17 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -20,7 +20,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
### The directory environment: ### The directory environment:
DVBDIR = ../../../../DVB
VDRDIR = ../../.. VDRDIR = ../../..
LIBDIR = ../../lib LIBDIR = ../../lib
TMPDIR = /tmp TMPDIR = /tmp
@ -40,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE)
### Includes and Defines (add further entries here): ### 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)"' DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'

5
PLUGINS/src/status/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.8 2005/11/11 13:20:14 kls Exp $ # $Id: Makefile 1.9 2006/04/15 11:59:23 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -20,7 +20,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
### The directory environment: ### The directory environment:
DVBDIR = ../../../../DVB
VDRDIR = ../../.. VDRDIR = ../../..
LIBDIR = ../../lib LIBDIR = ../../lib
TMPDIR = /tmp TMPDIR = /tmp
@ -40,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE)
### Includes and Defines (add further entries here): ### 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)"' DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'

5
PLUGINS/src/svdrpdemo/Makefile
View File

@ -1,7 +1,7 @@
# #
# Makefile for a Video Disk Recorder plugin # Makefile for a Video Disk Recorder plugin
# #
# $Id: Makefile 1.2 2005/11/11 13:20:14 kls Exp $ # $Id: Makefile 1.3 2006/04/15 11:59:28 kls Exp $
# The official name of this plugin. # The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin. # This name will be used in the '-P...' option of VDR to load the plugin.
@ -20,7 +20,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
### The directory environment: ### The directory environment:
DVBDIR = ../../../../DVB
VDRDIR = ../../.. VDRDIR = ../../..
LIBDIR = ../../lib LIBDIR = ../../lib
TMPDIR = /tmp TMPDIR = /tmp
@ -40,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE)
### Includes and Defines (add further entries here): ### 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)"' DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'

5
newplugin
View File

@ -12,7 +12,7 @@
# See the main source file 'vdr.c' for copyright information and # See the main source file 'vdr.c' for copyright information and
# how to reach the author. # how to reach the author.
# #
# $Id: newplugin 1.23 2006/04/15 11:18:36 kls Exp $ # $Id: newplugin 1.24 2006/04/15 11:59:43 kls Exp $
$PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n"; $PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
@ -75,7 +75,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
### The directory environment: ### The directory environment:
DVBDIR = ../../../../DVB
VDRDIR = ../../.. VDRDIR = ../../..
LIBDIR = ../../lib LIBDIR = ../../lib
TMPDIR = /tmp TMPDIR = /tmp
@ -95,7 +94,7 @@ PACKAGE = vdr-\$(ARCHIVE)
### Includes and Defines (add further entries here): ### 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)"' DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'