summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY4
-rw-r--r--plugins/profiler/vdrDVBProfiler/Makefile5
-rw-r--r--plugins/provider/recProvider/Makefile5
-rw-r--r--plugins/provider/vdrProvider/Makefile5
4 files changed, 16 insertions, 3 deletions
diff --git a/HISTORY b/HISTORY
index 2c3cca6..8380a94 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,10 @@
VDR Plugin 'upnp' Revision History
----------------------------------
+ - New: plugin makefile now links against the full file of the upnp plugin
+ so-file. This makes symbolic link against the .so obsolete.
+ Thanks to mini73
+
2012-10-24: Version 1.0.0
- New: Plug-ins for providing access to live-TV and recordings instead of
diff --git a/plugins/profiler/vdrDVBProfiler/Makefile b/plugins/profiler/vdrDVBProfiler/Makefile
index 7ff813f..28c8748 100644
--- a/plugins/profiler/vdrDVBProfiler/Makefile
+++ b/plugins/profiler/vdrDVBProfiler/Makefile
@@ -24,13 +24,16 @@ VDRLIBDIR ?= $(UPNPDIR)/../../lib
APIVERSION = $(shell sed -ne '/define UPNPPLUGIN_VERSION/s/^.*"\(.*\)".*$$/\1/p' $(UPNPDIR)/include/plugin.h)
+VDRDIR ?= $(UPNPDIR)/../../..
+VDRAPIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+
INCLUDES += -I$(UPNPDIR)/include
DEFINES += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
OBJS = $(PROFILE)Profiler.o
-LIBS = -L$(VDRLIBDIR) -Wl,-R$(VDRLIBDIR) -lvdr-upnp
+LIBS = -L$(VDRLIBDIR) -Wl,-R$(VDRLIBDIR) $(VDRLIBDIR)/libvdr-upnp.so.$(VDRAPIVERSION)
all: libupnp-$(PROFILE)-profiler.so
diff --git a/plugins/provider/recProvider/Makefile b/plugins/provider/recProvider/Makefile
index 85adf12..d23a6e7 100644
--- a/plugins/provider/recProvider/Makefile
+++ b/plugins/provider/recProvider/Makefile
@@ -24,13 +24,16 @@ VDRLIBDIR ?= $(UPNPDIR)/../../lib
APIVERSION = $(shell sed -ne '/define UPNPPLUGIN_VERSION/s/^.*"\(.*\)".*$$/\1/p' $(UPNPDIR)/include/plugin.h)
+VDRDIR ?= $(UPNPDIR)/../../..
+VDRAPIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+
INCLUDES += -I$(UPNPDIR)/include
DEFINES += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
OBJS = $(SCHEMA)Provider.o
-LIBS = -L$(VDRLIBDIR) -Wl,-R$(VDRLIBDIR) -lvdr-upnp
+LIBS = -L$(VDRLIBDIR) -Wl,-R$(VDRLIBDIR) $(VDRLIBDIR)/libvdr-upnp.so.$(VDRAPIVERSION)
all: libupnp-$(SCHEMA)-provider.so
diff --git a/plugins/provider/vdrProvider/Makefile b/plugins/provider/vdrProvider/Makefile
index ce4dedd..9f8361e 100644
--- a/plugins/provider/vdrProvider/Makefile
+++ b/plugins/provider/vdrProvider/Makefile
@@ -24,13 +24,16 @@ VDRLIBDIR ?= $(UPNPDIR)/../../lib
APIVERSION = $(shell sed -ne '/define UPNPPLUGIN_VERSION/s/^.*"\(.*\)".*$$/\1/p' $(UPNPDIR)/include/plugin.h)
+VDRDIR ?= $(UPNPDIR)/../../..
+VDRAPIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+
INCLUDES += -I$(UPNPDIR)/include
DEFINES += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
OBJS = $(SCHEMA)Provider.o
-LIBS = -L$(VDRLIBDIR) -Wl,-R$(VDRLIBDIR) -lvdr-upnp
+LIBS = -L$(VDRLIBDIR) -Wl,-R$(VDRLIBDIR) $(VDRLIBDIR)/libvdr-upnp.so.$(VDRAPIVERSION)
all: libupnp-$(SCHEMA)-provider.so