Moved strictly necessary Makefile options into Make.global

This commit is contained in:
Klaus Schmidinger
2010-02-06 15:02:35 +01:00
parent f7831543b3
commit 91115a64e4
13 changed files with 102 additions and 27 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 2.6 2010/01/17 12:32:18 kls Exp $
# $Id: Makefile 2.7 2010/02/06 14:50:03 kls Exp $
.DELETE_ON_ERROR:
@@ -32,6 +32,7 @@ CONFDIR = $(VIDEODIR)
DOXYGEN = /usr/bin/doxygen
DOXYFILE = Doxyfile
include Make.global
-include Make.config
SILIB = $(LSIDIR)/libsi.a
@@ -60,8 +61,6 @@ DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\" -DRCU_DEVICE=\"$(RCU_DEVICE)\"
DEFINES += -D_GNU_SOURCE
DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
DEFINES += -DCONFDIR=\"$(CONFDIR)\"
DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"