Removed DVBDIR from Makefile; it's now defined in Make.config if necessary

This commit is contained in:
Klaus Schmidinger
2006-04-15 12:39:35 +02:00
parent b49df33917
commit 12ea50fceb
13 changed files with 40 additions and 50 deletions

View File

@@ -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\