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

View File

@@ -6,7 +6,7 @@
# See the main source file 'vdr.c' for copyright information and
# 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:
@@ -17,12 +17,10 @@ CXX = g++
CXXFLAGS = $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses
CFLAGS += -fPIC
CXXFLAGS += -fPIC
# Use 'make M32=1 ...' to build a 32-bit version of VDR on a 64-bit machine:
ifdef M32
CFLAGS += -m32
CXXFLAGS += -m32
endif
### The directory environment:
@@ -57,9 +55,3 @@ LIRC_DEVICE = /var/run/lirc/lircd
## 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