From: Rémi Denis-Courmont <rem@videolan.org>
Date: Sun, 19 Feb 2006 15:46:44 +0000 (+0000)
Subject: Fix Mozilla plugin on ELF architectures
X-Git-Tag: 0.9.0-test0~12246
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=2f684f47b5bfc56ab4bf415b7e32c3dea6ec4816;p=vlc

Fix Mozilla plugin on ELF architectures
---

diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index 6d6b6f505a..d57c545514 100644
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -27,9 +27,11 @@ DIST_misc = \
 	$(NULL)
 
 if BUILD_SHARED
-LIBRARIES_libvlc = $(top_builddir)/src/libvlc$(LIBEXT)
+LIBRARIES_libvlc_pic = $(top_builddir)/src/libvlc$(LIBEXT)
+LIBRARIES_libvlc_nopic = $(top_builddir)/src/libvlc$(LIBEXT)
 else
-LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a
+LIBRARIES_libvlc_pic = $(top_builddir)/src/libvlc_pic.a
+LIBRARIES_libvlc_nopic = $(top_builddir)/src/libvlc.a
 endif
 
 if BUILD_MOZILLA
@@ -39,6 +41,7 @@ if BUILD_MOZILLA
 # under Win32 and npunix.c under Unix.
 if HAVE_WIN32
 
+LIBRARIES_libvlc = $(LIBRARIES_libvlc_nopic)
 
 npvlc_DATA = npvlc$(LIBEXT)
 npvlcdir = $(libdir)
@@ -57,6 +60,8 @@ LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc) `$(VLC_CONFIG) --libs mozilla vlc bu
 else
 if HAVE_DARWIN
 
+LIBRARIES_libvlc = $(LIBRARIES_libvlc_nopic)
+
 npvlc_DATA = npvlc$(LIBEXT)
 npvlcdir = $(libdir)
 
@@ -90,6 +95,8 @@ VLC\ Plugin.plugin: npvlc.rsrc npvlc.dylib
 
 else
 
+LIBRARIES_libvlc = $(LIBRARIES_libvlc_pic)
+
 npvlc_DATA = libvlcplugin$(LIBEXT)
 npvlcdir = $(libdir)/mozilla/plugins