summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Volkenandt <sascha (at) akv-soft (dot) de>2007-05-29 16:06:58 +0000
committerSascha Volkenandt <sascha (at) akv-soft (dot) de>2007-05-29 16:06:58 +0000
commit7d8bd157423f8e20c4b8a33bf937b4407ec3d543 (patch)
tree66d83394381790538c66ee8dac26281ba40a225f
parent3235a22cc6a3bb2ace6a21e7fa028d21b5fdd476 (diff)
downloadvdr-plugin-live-7d8bd157423f8e20c4b8a33bf937b4407ec3d543.tar.gz
vdr-plugin-live-7d8bd157423f8e20c4b8a33bf937b4407ec3d543.tar.bz2
- added zzam's suggestion regarding --as-needed
-rw-r--r--Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 3fe11d6..fd812e7 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# $Id: Makefile,v 1.36 2007/05/24 07:20:45 winni Exp $
+# $Id: Makefile,v 1.37 2007/05/29 16:06:58 lordjaxom Exp $
# The official name of this plugin.
# This name will be used in the '-P...' option of VDR to load the plugin.
@@ -26,7 +26,7 @@ LDFLAGS ?= -fPIC -g
ECPPC ?= ecppc
CXXFLAGS += `tntnet-config --cxxflags`
-LDFLAGS += `tntnet-config --libs`
+LIBS += $(shell tntnet-config --libs)
### The directory environment:
@@ -71,7 +71,7 @@ WEBLIBS = pages/libpages.a css/libcss.a images/libimages.a \
.PHONY: all dist clean SUBDIRS
-all: SUBDIRS libvdr-$(PLUGIN).so
+all: libvdr-$(PLUGIN).so
### Implicit rules:
@@ -94,7 +94,7 @@ SUBDIRS:
make -C $$dir CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" || exit 1; \
done
-libvdr-$(PLUGIN).so: $(PLUGINOBJS) $(LIBS) $(WEBLIBS)
+libvdr-$(PLUGIN).so: SUBDIRS $(PLUGINOBJS)
$(CXX) $(LDFLAGS) -shared -o $@ $(PLUGINOBJS) -Wl,--whole-archive $(WEBLIBS) -Wl,--no-whole-archive $(LIBS)
@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)