summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2012-12-27 11:58:09 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2012-12-27 11:58:09 +0100
commit28441aded5649e2650b9346f42d559768295651c (patch)
tree69a612f1f0150c4740597ed611eb5c10dc3be60c /Makefile
parent70c4a2d5d518309c7792ace4a9f6603748f39f4a (diff)
downloadvdr-28441aded5649e2650b9346f42d559768295651c.tar.gz
vdr-28441aded5649e2650b9346f42d559768295651c.tar.bz2
DVBDIR is now conveyed to plugins via the CFLAGS; removed some redundancy from Make.config.template
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 5 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ccc74af5..2adb203e 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
# See the main source file 'vdr.c' for copyright information and
# 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:
@@ -17,7 +17,6 @@ CXX ?= g++
CXXFLAGS ?= $(CFLAGS) -Werror=overloaded-virtual -Wno-parentheses
CFLAGS += -fPIC
-CXXFLAGS += -fPIC
CDEFINES = -D_GNU_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
+ifdef DVBDIR
+CFLAGS += -I$(DVBDIR)/include
+endif
+
SILIB = $(LSIDIR)/libsi.a
OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o dvbci.o\