From 91115a64e4cb8860aee4938b7359ad4dc35babe6 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 6 Feb 2010 15:02:35 +0100 Subject: Moved strictly necessary Makefile options into Make.global --- newplugin | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'newplugin') diff --git a/newplugin b/newplugin index 52ef72ea..ffc43d3b 100755 --- a/newplugin +++ b/newplugin @@ -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 \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 -- cgit v1.2.3