Propagate libvlc move in plugins

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 6d72ab7d9f0cb8c2e860f5c73d340bd75725a8dc..906ca553354b8b2853a4360e861e885dfce76d78 100644 (file)
--- 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 0d3f59bab6c5a834040687059e855e95b5aec2c0..890dfedd601c0002d2573a8b6a8ffdb2d1ff4455 100644 (file)
--- 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 8dfaae5abeeccd4225cb8aea376424e5fc8f44f9..09641494706d3028abd778c304c03b88dba8f8cb 100644 (file)
--- 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