Commit 56d009ad authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Propagate libvlc move in plugins

parent 238cc870
......@@ -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
......
......@@ -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():
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment