Without this patch, if some options in `Makefile` were set outside `Makefile`
and no `Make.config` existed with the necessary options, builds could fail.
[1][2][3]
Therefore include strictly necessary options in `Make.global` and include this
in all the Makefiles before `Make.config`.
[1] http://www.linuxtv.org/pipermail/vdr/2009-July/020977.html
[2] http://www.linuxtv.org/pipermail/vdr/2009-December/021807.html
[3] http://www.linuxtv.org/pipermail/vdr/2010-January/022235.html
v2: Use `include` instead of `-include` to get a warning/error if it is not
present. [4]
v3: Change according to Frank’s comments [5].
• Delete options set in `Make.global` from other Makefiles.
• Leave adding `-fPIC` to `C[XX]FLAGS` in `Make.config.template` as the flags
get reset including `Make.config`.
• Modify `newplugin`.
[4] http://www.gnu.org/software/make/manual/make.html#Include
[5] http://www.linuxtv.org/pipermail/vdr/2010-January/022243.html
Signed-off-by: Paul Menzel
---
Make.config.template |1 -
Make.global | 14 ++
Makefile |3 +--
PLUGINS/src/dvbsddevice/Makefile |8 +---
PLUGINS/src/hello/Makefile |6 +-
PLUGINS/src/osddemo/Makefile |6 +-
PLUGINS/src/pictures/Makefile|6 +-
PLUGINS/src/servicedemo/Makefile |6 +-
PLUGINS/src/skincurses/Makefile |6 +-
PLUGINS/src/status/Makefile |6 +-
PLUGINS/src/svdrpdemo/Makefile |6 +-
newplugin|8 +---
12 files changed, 60 insertions(+), 16 deletions(-)
create mode 100644 Make.global
diff --git a/Make.config.template b/Make.config.template
index 758fc14..6fffa0e 100644
--- a/Make.config.template
+++ b/Make.config.template
@@ -19,7 +19,6 @@ CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
ifdef PLUGIN
CFLAGS += -fPIC
CXXFLAGS += -fPIC
-DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
endif
### The directory environment:
diff --git a/Make.global b/Make.global
new file mode 100644
index 000..5ef70f0
--- /dev/null
+++ b/Make.global
@@ -0,0 +1,14 @@
+#
+# Strictly necessary Makefile options for the Video Disk Recorder
+#
+# See the main source file 'vdr.c' for copyright information and
+# how to reach the author.
+
+# Plugins need to be compiled with position independent code, otherwise linking
+# VDR against it will fail.
+ifdef PLUGIN
+CFLAGS += -fPIC
+CXXFLAGS += -fPIC
+endif
+
+DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
diff --git a/Makefile b/Makefile
index e13ea5e..a2659be 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ CONFDIR = $(VIDEODIR)
DOXYGEN = /usr/bin/doxygen
DOXYFILE = Doxyfile
+include Make.global
-include Make.config
SILIB= $(LSIDIR)/libsi.a
@@ -60,8 +61,6 @@ DEFINES += -DLIRC_DEVICE=\"$(LIRC_DEVICE)\"
-DRCU_DEVICE=\"$(RCU_DEVICE)\"
DEFINES += -D_GNU_SOURCE
-DEFINES += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-
DEFINES += -DVIDEODIR=\"$(VIDEODIR)\"
DEFINES += -DCONFDIR=\"$(CONFDIR)\"
DEFINES += -DPLUGINDIR=\"$(PLUGINLIBDIR)\"
diff --git a/PLUGINS/src/dvbsddevice/Makefile b/PLUGINS/src/dvbsddevice/Makefile
index 8ef273c..345543e 100644
--- a/PLUGINS/src/dvbsddevice/Makefile
+++ b/PLUGINS/src/dvbsddevice/Makefile
@@ -18,7 +18,11 @@ VERSION = $(shell grep 'static const char \*VERSION *='
$(PLUGIN).c | awk '{ pri
### The C++ compiler and options:
CXX ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+
+### Make sure that necessary options are included:
+
+include $(VDRDIR)/Make.global
### The directory environment:
@@ -45,8 +49,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 dvbsdffdevice.o dvbsdffosd.o
diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile
index ea5b806..1ec3170 100644
--- a/PLUGINS/src/hello/Makefile
+++ b/PLUGINS/src/hello/Makefile
@@ -18,7 +18,11 @@ VERSION = $(shell grep 'static const char \*VERSION *='
$(PLUGIN).c | awk '{ pri
### The C++ compiler and options:
CXX ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+
+### Make sure that necessary options are included:
+
+include $(VDRDIR)/Make.global
### The directory environment:
diff --git a/PLUGINS/src/osddemo/Makefile b/PLUGINS/src/osddemo/Makefile
index 1b1c622..2a7f836 100644
--- a/PLUGINS/src/osddemo/Makefile
+++ b/PLUGINS/src/osddemo/Makefile
@@ -16,7 +16,11 @@ VERSION = $(shell grep 'static const char \*VERSION *='
$(PLUGIN).c | awk '{ pri
### The C++ compiler and options:
CXX ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -
