summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2007-05-05 21:59:58 +0000
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2007-05-05 21:59:58 +0000
commit36a0bb39d832bef433ee81c4f156411df521b358 (patch)
tree6aa6e6c8cf4b27abf6acf5514d5b70588c632818 /Makefile
parent140fd7ac69ca46835d01cc8f664a03b879fb71f4 (diff)
downloadvdr-plugin-live-36a0bb39d832bef433ee81c4f156411df521b358.tar.gz
vdr-plugin-live-36a0bb39d832bef433ee81c4f156411df521b358.tar.bz2
- Fix for the linking problem.
For details see: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=422372
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 363ce49..7a4bd38 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile,v 1.33 2007/05/04 18:53:31 lordjaxom Exp $
+# $Id: Makefile,v 1.34 2007/05/05 21:59:58 tadi Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -52,7 +52,7 @@ INCLUDES += -I$(VDRDIR)/include -Ihttpd
DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
export DEFINES
-LIBS += -lssl httpd/libhttpd.a
+LIBS += httpd/libhttpd.a -lssl
SUBDIRS = httpd pages css images javascript
@@ -93,7 +93,7 @@ SUBDIRS:
done
libvdr-$(PLUGIN).so: $(PLUGINOBJS) $(LIBS) $(WEBLIBS)
- $(CXX) $(LDFLAGS) -Wl,--whole-archive -shared -o $@ $^
+ $(CXX) $(LDFLAGS) -shared -o $@ $(PLUGINOBJS) -Wl,--whole-archive $(WEBLIBS) -Wl,--no-whole-archive $(LIBS)
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
dist: clean