From 56d009adf4a23a631465516c4590ef0be5520435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Sun, 19 Feb 2006 13:40:09 +0000
Subject: [PATCH] Propagate libvlc move in plugins

---
 activex/Makefile.am                   | 2 +-
 bindings/mediacontrol-python/setup.py | 4 ++--
 mozilla/Makefile.am                   | 7 ++-----
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 6d72ab7d9f..906ca55335 100644
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -59,7 +59,7 @@ DIST_misc = \
     test.html \
     $(NULL)
 
-LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a
 
 if BUILD_ACTIVEX
 
diff --git a/bindings/mediacontrol-python/setup.py b/bindings/mediacontrol-python/setup.py
index 0d3f59bab6..890dfedd60 100644
--- a/bindings/mediacontrol-python/setup.py
+++ b/bindings/mediacontrol-python/setup.py
@@ -3,10 +3,10 @@ import os
 
 if os.sys.platform in ('win32', 'darwin'):
     # Do not use PIC version on win32 and Mac OS X
-    vlclib='../../lib/libvlc.a'
+    vlclib='../../src/libvlc.a'
     picflag=''
 else:
-    vlclib='../../lib/libvlc_pic.a'
+    vlclib='../../src/libvlc_pic.a'
     picflag='pic'
 
 def get_vlcconfig():
diff --git a/mozilla/Makefile.am b/mozilla/Makefile.am
index 8dfaae5abe..0964149470 100644
--- a/mozilla/Makefile.am
+++ b/mozilla/Makefile.am
@@ -26,6 +26,8 @@ DIST_misc = \
 	vlcintf.idl \
 	$(NULL)
 
+LIBRARIES_libvlc = $(top_builddir)/src/libvlc.a
+
 if BUILD_MOZILLA
 
 # Under Win32, Mozilla plugins need to be named NP******.DLL, but under Unix
@@ -33,7 +35,6 @@ if BUILD_MOZILLA
 # under Win32 and npunix.c under Unix.
 if HAVE_WIN32
 
-LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a
 
 npvlc_DATA = npvlc$(LIBEXT)
 npvlcdir = $(libdir)
@@ -52,8 +53,6 @@ LDFLAGS_npvlc = -shared $(LIBRARIES_libvlc) `$(VLC_CONFIG) --libs mozilla vlc bu
 else
 if HAVE_DARWIN
 
-LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a
-
 npvlc_DATA = npvlc$(LIBEXT)
 npvlcdir = $(libdir)
 
@@ -87,8 +86,6 @@ VLC\ Plugin.plugin: npvlc.rsrc npvlc.dylib
 
 else
 
-LIBRARIES_libvlc = $(top_builddir)/lib/libvlc_pic.a
-
 npvlc_DATA = libvlcplugin$(LIBEXT)
 npvlcdir = $(libdir)/mozilla/plugins