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

@@ -12,7 +12,7 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
# $Id: newplugin 2.1 2009/12/06 15:31:58 kls Exp $
# $Id: newplugin 2.2 2010/02/06 14:50:03 kls Exp $
$PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
@@ -77,7 +77,7 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
### The C++ compiler and options:
CXX ?= g++
CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
### The directory environment:
@@ -85,6 +85,10 @@ VDRDIR = ../../..
LIBDIR = ../../lib
TMPDIR = /tmp
### Make sure that necessary options are included:
include \$(VDRDIR)/Make.global
### Allow user defined options to overwrite defaults:
-include \$(VDRDIR)/Make.config
@@ -104,8 +108,6 @@ INCLUDES += -I\$(VDRDIR)/include
DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
### The object files (add further files here):
OBJS = \$(PLUGIN).o