mirror of https://github.com/VDR4Arch/vdr.git
Removed DVBDIR from Makefile; it's now defined in Make.config if necessary
This commit is contained in:
Klaus Schmidinger
parent
b49df33917
commit
12ea50fceb
|
|
@ -1338,6 +1338,8 @@ Marco Schl
|
|||
for fixing handling DPID when deciding whether to switch to 'Transfer Mode'
|
||||
for adding VBITeletextDescriptorTag, TeletextDescriptorTag, LocalTimeOffsetDescriptorTag
|
||||
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>
|
||||
for reporting a bug in displaying the current channel when switching via the SVDRP
|
||||
|
|
|
|||
7
HISTORY
7
HISTORY
|
|
@ -4528,3 +4528,10 @@ Video Disk Recorder Revision History
|
|||
from Peter Dittmann). See PLUGINS.html for details.
|
||||
- Fixed setting the 'Delta' parameter when calling the shutdown script with
|
||||
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
17
INSTALL
|
|
@ -25,17 +25,12 @@ Compiling and running the program:
|
|||
|
||||
VDR requires the Linux-DVB driver header files to compile.
|
||||
As of kernel 2.6 these are part of the official Linux kernel
|
||||
distribution, and VDR's Makefile will automatically locate
|
||||
them. If you are using kernel 2.4 or earlier, you should
|
||||
install the files from this package in a directory that is
|
||||
"parallel" to the DVB directory of the driver source (refer to
|
||||
http://linuxtv.org for more information about that driver).
|
||||
For example, if the DVB driver was extracted into the directory
|
||||
/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.
|
||||
distribution, and so they should be automatically found in
|
||||
/usr/include/linux/dvb. If your DVB driver header files are
|
||||
in a different location, you can rename the file Make.config.template
|
||||
to Make.config and adjust the definition of DVBDIR in that file.
|
||||
|
||||
Refer to http://linuxtv.org for more information about the Linux-DVB driver.
|
||||
|
||||
VDR requires the Linux-DVB driver version dated 2003-08-23 or higher
|
||||
to work properly.
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
# See the main source file 'vdr.c' for copyright information and
|
||||
# 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:
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ CXXFLAGS = -fPIC -g -O2 -Wall -Woverloaded-virtual
|
|||
|
||||
### The directory environment:
|
||||
|
||||
#DVBDIR = ../DVB
|
||||
#DVBDIR = /usr/src/v4l-dvb/linux
|
||||
MANDIR = /usr/local/man
|
||||
BINDIR = /usr/local/bin
|
||||
|
||||
|
|
@ -33,3 +33,9 @@ RCU_DEVICE = /dev/ttyS1
|
|||
|
||||
## Define if you want vdr to not run as root
|
||||
#VDR_USER = vdr
|
||||
|
||||
### You don't need to touch the following:
|
||||
|
||||
ifdef DVBDIR
|
||||
INCLUDES += -I$(DVBDIR)/include
|
||||
endif
|
||||
|
|
|
|||
14
Makefile
14
Makefile
|
|
@ -4,7 +4,7 @@
|
|||
# See the main source file 'vdr.c' for copyright information and
|
||||
# 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:
|
||||
|
||||
|
|
@ -14,16 +14,6 @@ CFLAGS ?= -O2
|
|||
CXX ?= g++
|
||||
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
|
||||
MANDIR = /usr/local/man
|
||||
BINDIR = /usr/local/bin
|
||||
|
|
@ -40,8 +30,6 @@ DOXYFILE = Doxyfile
|
|||
|
||||
-include Make.config
|
||||
|
||||
INCLUDES += -I$(DVBDIR)/include
|
||||
|
||||
SILIB = $(LSIDIR)/libsi.a
|
||||
|
||||
OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbosd.o\
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# 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.
|
||||
# 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:
|
||||
|
||||
DVBDIR = ../../../../DVB
|
||||
VDRDIR = ../../..
|
||||
LIBDIR = ../../lib
|
||||
TMPDIR = /tmp
|
||||
|
|
@ -40,7 +39,7 @@ 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)"'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# 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.
|
||||
# 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:
|
||||
|
||||
DVBDIR = ../../../../DVB
|
||||
VDRDIR = ../../..
|
||||
LIBDIR = ../../lib
|
||||
TMPDIR = /tmp
|
||||
|
|
@ -40,7 +39,7 @@ 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)"'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# 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.
|
||||
# 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:
|
||||
|
||||
DVBDIR = ../../../../DVB
|
||||
VDRDIR = ../../..
|
||||
LIBDIR = ../../lib
|
||||
TMPDIR = /tmp
|
||||
|
|
@ -41,7 +40,7 @@ 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)"'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# 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.
|
||||
# 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:
|
||||
|
||||
DVBDIR = ../../../../DVB
|
||||
VDRDIR = ../../..
|
||||
LIBDIR = ../../lib
|
||||
TMPDIR = /tmp
|
||||
|
|
@ -40,7 +39,7 @@ 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)"'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# 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.
|
||||
# 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:
|
||||
|
||||
DVBDIR = ../../../../DVB
|
||||
VDRDIR = ../../..
|
||||
LIBDIR = ../../lib
|
||||
TMPDIR = /tmp
|
||||
|
|
@ -40,7 +39,7 @@ 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)"'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# 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.
|
||||
# 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:
|
||||
|
||||
DVBDIR = ../../../../DVB
|
||||
VDRDIR = ../../..
|
||||
LIBDIR = ../../lib
|
||||
TMPDIR = /tmp
|
||||
|
|
@ -40,7 +39,7 @@ 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)"'
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# 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.
|
||||
# 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:
|
||||
|
||||
DVBDIR = ../../../../DVB
|
||||
VDRDIR = ../../..
|
||||
LIBDIR = ../../lib
|
||||
TMPDIR = /tmp
|
||||
|
|
@ -40,7 +39,7 @@ 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)"'
|
||||
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
# See the main source file 'vdr.c' for copyright information and
|
||||
# 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";
|
||||
|
||||
|
|
@ -75,7 +75,6 @@ CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
|
|||
|
||||
### The directory environment:
|
||||
|
||||
DVBDIR = ../../../../DVB
|
||||
VDRDIR = ../../..
|
||||
LIBDIR = ../../lib
|
||||
TMPDIR = /tmp
|
||||
|
|
@ -95,7 +94,7 @@ 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)"'
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue