summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CONTRIBUTORS2
-rw-r--r--HISTORY12
-rw-r--r--Makefile10
-rw-r--r--PLUGINS/src/hello/HISTORY4
-rw-r--r--PLUGINS/src/hello/Makefile6
-rw-r--r--PLUGINS/src/hello/hello.c4
-rw-r--r--PLUGINS/src/osddemo/HISTORY4
-rw-r--r--PLUGINS/src/osddemo/Makefile6
-rw-r--r--PLUGINS/src/osddemo/osddemo.c4
-rw-r--r--PLUGINS/src/sky/HISTORY4
-rw-r--r--PLUGINS/src/sky/Makefile6
-rw-r--r--PLUGINS/src/sky/sky.c4
-rw-r--r--PLUGINS/src/status/HISTORY4
-rw-r--r--PLUGINS/src/status/Makefile6
-rw-r--r--PLUGINS/src/status/status.c4
-rw-r--r--libdtv/libsi/Makefile4
-rw-r--r--libdtv/libvdr/Makefile4
-rwxr-xr-xnewplugin6
18 files changed, 62 insertions, 32 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 985149fd..e08b23e0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -454,6 +454,8 @@ Andy Carter <fruit@ukgateway.net>
Robert Schiele <rschiele@uni-mannheim.de>
for his help in keeping 'channels.conf.cable' up to date
for reporting some faulty default parameter initializations
+ for suggesting to only set the Makefile variables CXX and CXXFLAGS if they are not
+ yet defined
Gerhard Steiner <steiner@mail.austria.com>
for suggesting that the SVDRP command PUTE shall trigger an immediate write of
diff --git a/HISTORY b/HISTORY
index 937a5d3b..eeec39ab 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1869,3 +1869,15 @@ Video Disk Recorder Revision History
and only creating the KBD remote control if VDR is running in the foreground.
- Fixed taking an active SVDRP connection into account when doing shutdown (thanks
to Gregoire Favre for reporting this one).
+- Changed setting of CXX and CXXFLAGS variables in Makefile, so that an externally
+ defined value will be taken if present (suggested by Robert Schiele).
+ Plugin authors should please change the lines
+
+ CXX = g++
+ CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+
+ in their Makefile to
+
+ CXX ?= g++
+ CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
+
diff --git a/Makefile b/Makefile
index 7d169ce6..bfd7a413 100644
--- a/Makefile
+++ b/Makefile
@@ -4,15 +4,15 @@
# See the main source file 'vdr.c' for copyright information and
# how to reach the author.
#
-# $Id: Makefile 1.53 2002/12/08 12:20:37 kls Exp $
+# $Id: Makefile 1.54 2002/12/13 14:49:12 kls Exp $
.DELETE_ON_ERROR:
-CC = gcc
-CFLAGS = -O2
+CC ?= gcc
+CFLAGS ?= -O2
-CXX = g++
-CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual
+CXX ?= g++
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual
DVBDIR = ../DVB
DTVDIR = ./libdtv
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY
index 53b620e9..f5e90bae 100644
--- a/PLUGINS/src/hello/HISTORY
+++ b/PLUGINS/src/hello/HISTORY
@@ -41,3 +41,7 @@ VDR Plugin 'hello' Revision History
2002-11-23: Version 0.0.9
- Changed return type of MainMenuAction().
+
+2002-12-13: Version 0.1.0
+
+- Changed setting of CXX and CXXFLAGS variables in Makefile.
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index 92ac45f8..068f6e9e 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.7 2002/11/01 13:44:11 kls Exp $
+# $Id: Makefile 1.8 2002/12/13 14:54:14 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -15,8 +15,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
### The C++ compiler and options:
-CXX = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+CXX ?= g++
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
### The directory environment:
diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c
index 2f00ee71..e3c45f2b 100644
--- a/PLUGINS/src/hello/hello.c
+++ b/PLUGINS/src/hello/hello.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: hello.c 1.10 2002/11/16 13:20:26 kls Exp $
+ * $Id: hello.c 1.11 2002/12/13 15:01:43 kls Exp $
*/
#include <getopt.h>
@@ -12,7 +12,7 @@
#include <vdr/plugin.h>
#include "i18n.h"
-static const char *VERSION = "0.0.9";
+static const char *VERSION = "0.1.0";
static const char *DESCRIPTION = "A friendly greeting";
static const char *MAINMENUENTRY = "Hello";
diff --git a/PLUGINS/src/osddemo/HISTORY b/PLUGINS/src/osddemo/HISTORY
index 8c9d3e1a..c7d4ebcf 100644
--- a/PLUGINS/src/osddemo/HISTORY
+++ b/PLUGINS/src/osddemo/HISTORY
@@ -4,3 +4,7 @@ VDR Plugin 'osddemo' Revision History
2002-11-23: Version 0.0.1
- Initial revision.
+
+2002-12-13: Version 0.1.0
+
+- Changed setting of CXX and CXXFLAGS variables in Makefile.
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index ac56d1f7..db871613 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile 1.1 2002/11/23 14:56:44 kls Exp $
+# $Id: Makefile 1.2 2002/12/13 14:54:29 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -15,8 +15,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
### The C++ compiler and options:
-CXX = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+CXX ?= g++
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
### The directory environment:
diff --git a/PLUGINS/src/osddemo/osddemo.c b/PLUGINS/src/osddemo/osddemo.c
index f806178d..3ac8a2d9 100644
--- a/PLUGINS/src/osddemo/osddemo.c
+++ b/PLUGINS/src/osddemo/osddemo.c
@@ -3,12 +3,12 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: osddemo.c 1.1 2002/11/24 10:32:59 kls Exp $
+ * $Id: osddemo.c 1.2 2002/12/13 15:02:01 kls Exp $
*/
#include <vdr/plugin.h>
-static const char *VERSION = "0.0.1";
+static const char *VERSION = "0.1.0";
static const char *DESCRIPTION = "Demo of arbitrary OSD setup";
static const char *MAINMENUENTRY = "Osd Demo";
diff --git a/PLUGINS/src/sky/HISTORY b/PLUGINS/src/sky/HISTORY
index 8be01f15..bdb440b1 100644
--- a/PLUGINS/src/sky/HISTORY
+++ b/PLUGINS/src/sky/HISTORY
@@ -4,3 +4,7 @@ VDR Plugin 'sky' Revision History
2002-12-01: Version 0.0.1
- Initial revision.
+
+2002-12-13: Version 0.1.0
+
+- Changed setting of CXX and CXXFLAGS variables in Makefile.
diff --git a/PLUGINS/src/sky/Makefile b/PLUGINS/src/sky/Makefile
index 4e1eb2f0..3df93c18 100644
--- a/PLUGINS/src/sky/Makefile
+++ b/PLUGINS/src/sky/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile 1.1 2002/12/01 11:00:00 kls Exp $
+# $Id: Makefile 1.2 2002/12/13 14:54:24 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -15,8 +15,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
### The C++ compiler and options:
-CXX = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+CXX ?= g++
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
### The directory environment:
diff --git a/PLUGINS/src/sky/sky.c b/PLUGINS/src/sky/sky.c
index 627a9451..d6e10c92 100644
--- a/PLUGINS/src/sky/sky.c
+++ b/PLUGINS/src/sky/sky.c
@@ -3,7 +3,7 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: sky.c 1.1 2002/12/01 11:00:00 kls Exp $
+ * $Id: sky.c 1.2 2002/12/13 15:01:57 kls Exp $
*/
#include <sys/socket.h>
@@ -14,7 +14,7 @@
#include <vdr/plugin.h>
#include <vdr/sources.h>
-static const char *VERSION = "0.0.1";
+static const char *VERSION = "0.1.0";
static const char *DESCRIPTION = "Sky Digibox interface";
// --- cDigiboxDevice --------------------------------------------------------
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index 7d282915..1c399aab 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -27,3 +27,7 @@ VDR Plugin 'status' Revision History
2002-11-23: Version 0.0.6
- Changed return type of MainMenuAction().
+
+2002-12-13: Version 0.1.0
+
+- Changed setting of CXX and CXXFLAGS variables in Makefile.
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index 00fd97b5..18d5eeed 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.5 2002/11/01 13:44:25 kls Exp $
+# $Id: Makefile 1.6 2002/12/13 14:54:19 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -15,8 +15,8 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
### The C++ compiler and options:
-CXX = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+CXX ?= g++
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
### The directory environment:
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index e1000162..a0346591 100644
--- a/PLUGINS/src/status/status.c
+++ b/PLUGINS/src/status/status.c
@@ -3,13 +3,13 @@
*
* See the README file for copyright information and how to reach the author.
*
- * $Id: status.c 1.6 2002/11/16 13:20:26 kls Exp $
+ * $Id: status.c 1.7 2002/12/13 15:01:53 kls Exp $
*/
#include <vdr/plugin.h>
#include <vdr/status.h>
-static const char *VERSION = "0.0.6";
+static const char *VERSION = "0.1.0";
static const char *DESCRIPTION = "Status monitor test";
static const char *MAINMENUENTRY = NULL;
diff --git a/libdtv/libsi/Makefile b/libdtv/libsi/Makefile
index 38bff935..4f278a09 100644
--- a/libdtv/libsi/Makefile
+++ b/libdtv/libsi/Makefile
@@ -30,8 +30,8 @@
.DELETE_ON_ERROR:
-CC = gcc
-CFLAGS = -O2 -g -Wmissing-prototypes -Wstrict-prototypes \
+CC ?= gcc
+CFLAGS ?= -O2 -g -Wmissing-prototypes -Wstrict-prototypes \
-DNAPI -Wimplicit -D__USE_FIXED_PROTOTYPES__ # -ansi -pedantic
INCDIRS = -Iinclude -I../include
diff --git a/libdtv/libvdr/Makefile b/libdtv/libvdr/Makefile
index 8bcab4cb..0f2ad721 100644
--- a/libdtv/libvdr/Makefile
+++ b/libdtv/libvdr/Makefile
@@ -27,8 +27,8 @@
#
#
#
-CC = gcc
-CFLAGS = -O2 -g -Wmissing-prototypes -Wstrict-prototypes \
+CC ?= gcc
+CFLAGS ?= -O2 -g -Wmissing-prototypes -Wstrict-prototypes \
-Wimplicit -D__USE_FIXED_PROTOTYPES__ -I../include # -DDEBUG
diff --git a/newplugin b/newplugin
index 532157e3..1f4d5da1 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.13 2002/11/29 15:23:54 kls Exp $
+# $Id: newplugin 1.14 2002/12/13 14:51:46 kls Exp $
$PLUGIN_NAME = $ARGV[0] || die "Usage: newplugin <name>\n";
@@ -70,8 +70,8 @@ VERSION = \$(shell grep 'static const char \\*VERSION *=' \$(PLUGIN).c | awk '{
### The C++ compiler and options:
-CXX = g++
-CXXFLAGS = -O2 -Wall -Woverloaded-virtual
+CXX ?= g++
+CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual
### The directory environment:
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-22 17:55:00 +0000