summaryrefslogtreecommitdiff
path: root/PLUGINS/src/status
diff options
context:
space:
mode:
Diffstat (limited to 'PLUGINS/src/status')
-rw-r--r--PLUGINS/src/status/HISTORY4
-rw-r--r--PLUGINS/src/status/Makefile7
-rw-r--r--PLUGINS/src/status/status.c4
3 files changed, 12 insertions, 3 deletions
diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY
index 01af66a..80b6fd5 100644
--- a/PLUGINS/src/status/HISTORY
+++ b/PLUGINS/src/status/HISTORY
@@ -48,3 +48,7 @@ VDR Plugin 'status' Revision History
2012-03-11: Version 0.3.1
- Added new parameter LiveView to ChannelSwitch() (reported by Udo Richter).
+
+2012-12-27: Version 0.3.2
+
+- Adapted Makefile to changes introduced in recent VDR versions.
diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile
index fc8ef9e..9635a5d 100644
--- a/PLUGINS/src/status/Makefile
+++ b/PLUGINS/src/status/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile 2.10 2012/12/23 10:04:43 kls Exp $
+# $Id: Makefile 2.13 2012/12/29 10:29:20 kls Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -18,6 +18,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
# Use package data if installed...otherwise assume we're under the VDR source directory:
PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
LIBDIR = $(DESTDIR)$(call PKGCFG,libdir)
+PLGCFG = $(call PKGCFG,plgcfg)
#
TMPDIR ?= /tmp
@@ -30,6 +31,10 @@ export CXXFLAGS = $(call PKGCFG,cxxflags)
APIVERSION = $(call PKGCFG,apiversion)
+### Allow user defined options to overwrite defaults:
+
+-include $(PLGCFG)
+
### The name of the distribution archive:
ARCHIVE = $(PLUGIN)-$(VERSION)
diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c
index e27fa5d..fdf1104 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 2.1 2012/03/11 14:48:37 kls Exp $
+ * $Id: status.c 2.2 2012/12/27 10:39:26 kls Exp $
*/
#include <vdr/plugin.h>
#include <vdr/status.h>
-static const char *VERSION = "0.3.1";
+static const char *VERSION = "0.3.2";
static const char *DESCRIPTION = "Status monitor test";
static const char *MAINMENUENTRY = NULL;