summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2006-04-15 12:39:35 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2006-04-15 12:39:35 +0200
commit12ea50fceba47cbfde1e11da4fff9aa5f5b2aeda (patch)
treed5a615c30e728df15c8117635e89be5f15b560ed /Makefile
parentb49df33917938bac6b57d7a122133cbe0b6b3d39 (diff)
downloadvdr-12ea50fceba47cbfde1e11da4fff9aa5f5b2aeda.tar.gz
vdr-12ea50fceba47cbfde1e11da4fff9aa5f5b2aeda.tar.bz2
Removed DVBDIR from Makefile; it's now defined in Make.config if necessary
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile14
1 files changed, 1 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 60373a38..d18be29a 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 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\