summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Brachold <vdr07@deltab.de>2010-03-06 06:09:38 +0000
committerAndreas Brachold <vdr07@deltab.de>2010-03-06 06:09:38 +0000
commitd4559b558caf85a3a19ef9c36198936fc7f8d734 (patch)
tree6fde5c657df17b1cfc83abea093af328885d70d6
parent38452d2da656898da7d595c315dd5fc4ca5deb9c (diff)
downloadvdr-plugin-image-d4559b558caf85a3a19ef9c36198936fc7f8d734.tar.gz
vdr-plugin-image-d4559b558caf85a3a19ef9c36198936fc7f8d734.tar.bz2
Fix to compile plugins with VDR >= 1.7.13
-rw-r--r--HISTORY3
-rw-r--r--Makefile14
2 files changed, 10 insertions, 7 deletions
diff --git a/HISTORY b/HISTORY
index def8ffd..690d4ce 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,9 @@
VDR Plugin 'image' Revision History
-----------------------------------
+2010-03-06
+- Fix to compile plugins with VDR >= 1.7.13 (Thomas Günther, for summit a patch)
+
2008-12-14
- Release Version 0.3.0
diff --git a/Makefile b/Makefile
index 5093191..e0f45f2 100644
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,12 @@
#FFMDIR = ../../../../ffmpeg
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
+#
+PLUGIN = image
+
### The C++ compiler and options:
CXX ?= g++
@@ -44,12 +50,6 @@ TMPDIR = /tmp
-include $(VDRDIR)/Make.config
-# The official name of this plugin.
-# This name will be used in the '-P...' option of VDR to load the plugin.
-# By default the main source file also carries this name.
-#
-PLUGIN = image
-
### The version number of this plugin (taken from the main source file):
VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
@@ -182,7 +182,7 @@ subdirs:
@for i in $(SUBDIRS) ;\
do \
( cd $$i;\
- $(MAKE) all;\
+ $(MAKE) all PLUGIN=$(PLUGIN);\
) \
|| exit 1;\
done