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

DVBDIR is now conveyed to plugins via the CFLAGS; removed some redundancy from Make.config.template

This commit is contained in:
Klaus Schmidinger 2012-12-27 11:58:09 +01:00
parent 70c4a2d5d5
commit 28441aded5
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
HISTORY
View File

@ -7465,3 +7465,10 @@ Video Disk Recorder Revision History
- Making sure that plugins include the VDR header files from the actual VDR source - Making sure that plugins include the VDR header files from the actual VDR source
directory when doing "make plugins" (suggested by Christoper Reimer). directory when doing "make plugins" (suggested by Christoper Reimer).
- Increased the version numbers of all plugins to reflect the recent Makefile changes. - Increased the version numbers of all plugins to reflect the recent Makefile changes.
- Removed the lines
ifdef DVBDIR
INCLUDES += -I$(DVBDIR)/include
endif
from the file Make.config.template. If set, DVBDIR is now conveyed to plugins via
the CFLAGS.
- Removed some redundancy from Make.config.template.

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 2.12 2012/12/22 10:54:47 kls Exp $ # $Id: Make.config.template 2.13 2012/12/27 11:34:05 kls Exp $
### The C compiler and options: ### The C compiler and options:
@ -17,12 +17,10 @@ CXX = g++
CXXFLAGS = $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses CXXFLAGS = $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses
CFLAGS += -fPIC CFLAGS += -fPIC
CXXFLAGS += -fPIC
# Use 'make M32=1 ...' to build a 32-bit version of VDR on a 64-bit machine: # Use 'make M32=1 ...' to build a 32-bit version of VDR on a 64-bit machine:
ifdef M32 ifdef M32
CFLAGS += -m32 CFLAGS += -m32
CXXFLAGS += -m32
endif endif
### The directory environment: ### The directory environment:
@ -57,9 +55,3 @@ LIRC_DEVICE = /var/run/lirc/lircd
## 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

7
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 2.37 2012/12/26 10:55:01 kls Exp $ # $Id: Makefile 2.38 2012/12/27 11:28:21 kls Exp $
.DELETE_ON_ERROR: .DELETE_ON_ERROR:
@ -17,7 +17,6 @@ CXX ?= g++
CXXFLAGS ?= $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses CXXFLAGS ?= $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses
CFLAGS += -fPIC CFLAGS += -fPIC
CXXFLAGS += -fPIC
CDEFINES = -D_GNU_SOURCE CDEFINES = -D_GNU_SOURCE
CDEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE CDEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
@ -49,6 +48,10 @@ PCDIR ?= $(firstword $(subst :, , ${PKG_CONFIG_PATH}:$(shell pkg-config --vari
-include Make.config -include Make.config
ifdef DVBDIR
CFLAGS += -I$(DVBDIR)/include
endif
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 dvbci.o\ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\