summaryrefslogtreecommitdiff
path: root/newplugin
diff options
context:
space:
mode:
Diffstat (limited to 'newplugin')
-rwxr-xr-xnewplugin26
1 files changed, 12 insertions, 14 deletions
diff --git a/newplugin b/newplugin
index 3a4586c..a5004dc 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 1.9 2002/10/26 14:32:12 kls Exp $
+# $Id: newplugin 1.11 2002/11/01 13:43:50 kls Exp $
$PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
@@ -68,19 +68,22 @@ PLUGIN = $PLUGIN_NAME
VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{ print \$\$6 }' | sed -e 's/[";]//g')
+### The C++ compiler and options:
+
+CXX = g++
+CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+
### The directory environment:
-ifdef NEWSTRUCT
-DVBDIR = ../../../../DVB/include
-DEFINES += -DNEWSTRUCT
-else
-DVBDIR = ../../../../DVB/ost/include
-endif
+DVBDIR = ../../../../DVB
VDRDIR = ../../..
-VDRINC = \$(VDRDIR)/include
LIBDIR = ../../lib
TMPDIR = /tmp
+### Allow user defined options to overwrite defaults:
+
+-include \$(VDRDIR)/Make.config
+
### The version number of VDR (taken from VDR's "config.h"):
VDRVERSION = \$(shell grep 'define VDRVERSION ' \$(VDRDIR)/config.h | awk '{ print \$\$3 }' | sed -e 's/"//g')
@@ -92,7 +95,7 @@ PACKAGE = vdr-\$(ARCHIVE)
### Includes and Defines (add further entries here):
-INCLUDES = -I\$(VDRINC) -I\$(DVBDIR)
+INCLUDES += -I\$(VDRDIR)/include -I\$(DVBDIR)/include
DEFINES += -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
@@ -100,11 +103,6 @@ DEFINES += -DPLUGIN_NAME_I18N='"\$(PLUGIN)"'
OBJS = \$(PLUGIN).o
-### The C++ compiler and options:
-
-CXX = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
-
### Implicit rules:
%.o: %.c