summaryrefslogtreecommitdiff
path: root/PLUGINS
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2002-11-01 14:05:36 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2002-11-01 14:05:36 +0100
commit5dd0c65e3519c21f79b0e8f69df01c28223e6283 (patch)
tree4c2eb9ab0ddac19762b831c45081681a32c5515a /PLUGINS
parent5a418a9efe541cb4902475bda0ebe79da32915aa (diff)
downloadvdr-5dd0c65e3519c21f79b0e8f69df01c28223e6283.tar.gz
vdr-5dd0c65e3519c21f79b0e8f69df01c28223e6283.tar.bz2
The Makefile now includes the file Make.config
Diffstat (limited to 'PLUGINS')
-rw-r--r--PLUGINS/src/hello/HISTORY1
-rw-r--r--PLUGINS/src/hello/Makefile21
-rw-r--r--PLUGINS/src/status/HISTORY1
-rw-r--r--PLUGINS/src/status/Makefile21
4 files changed, 26 insertions, 18 deletions
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index 61893d02..8639e056 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -36,3 +36,4 @@ VDR Plugin 'hello' Revision History
- Completely switched to the new CVS HEAD version of the linux-dvb driver.
The NEWSTRUCT compile time switch is now obsolete. The required driver is now
the CVS HEAD version dated 2002-11-01 or later.
+- Introduced Make.config.
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 52a695a1..92ac45f8 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile 1.6 2002/11/01 10:15:37 kls Exp $
+# $Id: Makefile 1.7 2002/11/01 13:44:11 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -13,14 +13,22 @@ PLUGIN = hello
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:
-DVBDIR = ../../../../DVB/include
+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')
@@ -32,7 +40,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)"'
@@ -40,11 +48,6 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
OBJS = $(PLUGIN).o i18n.o
-### The C++ compiler and options:
-
-CXX = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
-
### Implicit rules:
%.o: %.c
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index 45d0fe5c..45d42fbf 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -22,3 +22,4 @@ VDR Plugin 'status' Revision History
- Completely switched to the new CVS HEAD version of the linux-dvb driver.
The NEWSTRUCT compile time switch is now obsolete. The required driver is now
the CVS HEAD version dated 2002-11-01 or later.
+- Introduced Make.config.
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index a9676c11..00fd97b5 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile 1.4 2002/11/01 10:15:44 kls Exp $
+# $Id: Makefile 1.5 2002/11/01 13:44:25 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -13,14 +13,22 @@ PLUGIN = status
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:
-DVBDIR = ../../../../DVB/include
+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')
@@ -32,7 +40,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)"'
@@ -40,11 +48,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