From: Rémi Denis-Courmont Date: Thu, 15 May 2008 16:40:44 +0000 (+0300) Subject: Rename the shared libraries X-Git-Tag: 0.9.0-test0~938 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=84d0f814c4aaeb01141e993879de1ce8b0c7fedb;p=vlc Rename the shared libraries --- diff --git a/Makefile.am b/Makefile.am index 9e11cb44b6..8d05d54221 100644 --- a/Makefile.am +++ b/Makefile.am @@ -309,7 +309,7 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog # Don't use it if you don't know what it is about. # Don't complain if it doesn't work. -- Courmisch libvlc: - cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la + cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la core: cd src && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) @@ -671,8 +671,8 @@ package-win-common: # Copy relevant files cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/" cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/" + cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "vlc-$(VERSION)/" cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/" - cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-$(VERSION)/" for file in AUTHORS MAINTAINERS THANKS ; \ do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-$(VERSION)/$${file}.txt" ; done; @@ -774,8 +774,8 @@ endif package-win-common-strip: $(STRIP) "$(top_builddir)/vlc-$(VERSION)/vlc$(EXEEXT)" + $(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)" $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)" - $(STRIP) "vlc-$(VERSION)/libvlc-control$(LIBEXT)" if BUILD_MOZILLA $(STRIP) $(top_builddir)/vlc-$(VERSION)/mozilla/npvlc$(LIBEXT); endif diff --git a/bindings/cil/src/exception.cs b/bindings/cil/src/exception.cs index bf221aa4aa..0e76a242c1 100644 --- a/bindings/cil/src/exception.cs +++ b/bindings/cil/src/exception.cs @@ -1,5 +1,5 @@ /* - * libvlc.cs - libvlc-control CIL bindings + * libvlc.cs - libvlc CIL bindings * * $Id$ */ @@ -68,14 +68,14 @@ namespace VideoLAN.LibVLC int code; IntPtr message; - [DllImport ("libvlc-control.dll", EntryPoint="libvlc_exception_init")] + [DllImport ("libvlc.dll", EntryPoint="libvlc_exception_init")] static extern void Init (NativeException e); - [DllImport ("libvlc-control.dll", EntryPoint="libvlc_exception_clear")] + [DllImport ("libvlc.dll", EntryPoint="libvlc_exception_clear")] static extern void Clear (NativeException e); - /*[DllImport ("libvlc-control.dll", + /*[DllImport ("libvlc.dll", EntryPoint="libvlc_exception_raised")] static extern int Raised (NativeException e);*/ - [DllImport ("libvlc-control.dll", + [DllImport ("libvlc.dll", EntryPoint="libvlc_exception_get_message")] static extern IntPtr GetMessage (NativeException e); diff --git a/bindings/cil/src/libvlc.cs b/bindings/cil/src/libvlc.cs index afb6281350..b251c4131f 100644 --- a/bindings/cil/src/libvlc.cs +++ b/bindings/cil/src/libvlc.cs @@ -1,6 +1,6 @@ /** * @file libvlc.cs - * @brief libvlc-control CIL bindings + * @brief libvlc CIL bindings * * $Id$ */ @@ -71,11 +71,11 @@ namespace VideoLAN.LibVLC { } - [DllImport ("libvlc-control.dll", EntryPoint="libvlc_new")] + [DllImport ("libvlc.dll", EntryPoint="libvlc_new")] internal static extern InstanceHandle Create (int argc, U8String[] argv, NativeException ex); - [DllImport ("libvlc-control.dll", EntryPoint="libvlc_release")] + [DllImport ("libvlc.dll", EntryPoint="libvlc_release")] static extern void Destroy (IntPtr ptr, NativeException ex); /** @@ -115,7 +115,7 @@ namespace VideoLAN.LibVLC return new MediaDescriptor (dh); } - [DllImport ("libvlc-control.dll", EntryPoint="libvlc_playlist_loop")] + [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_loop")] static extern void PlaylistLoop (InstanceHandle self, bool b, NativeException ex); /** Sets the playlist loop flag. */ @@ -128,7 +128,7 @@ namespace VideoLAN.LibVLC } } - [DllImport ("libvlc-control.dll", EntryPoint="libvlc_playlist_play")] + [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_play")] static extern void PlaylistPlay (InstanceHandle self, int id, int optc, U8String[] optv, NativeException ex); /** Plays the next playlist item (if not already playing). */ @@ -138,7 +138,7 @@ namespace VideoLAN.LibVLC ex.Raise (); } - [DllImport ("libvlc-control.dll", EntryPoint="libvlc_playlist_pause")] + [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_pause")] static extern void PlaylistPause (InstanceHandle self, NativeException ex); /** Toggles pause (starts playing if stopped, pauses if playing). */ @@ -148,7 +148,7 @@ namespace VideoLAN.LibVLC ex.Raise (); } - [DllImport ("libvlc-control.dll", + [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_isplaying")] static extern int PlaylistIsPlaying (InstanceHandle self, NativeException ex); @@ -163,7 +163,7 @@ namespace VideoLAN.LibVLC } } - [DllImport ("libvlc-control.dll", EntryPoint="libvlc_playlist_stop")] + [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_stop")] static extern void PlaylistStop (InstanceHandle self, NativeException ex); /** Stops playing. */ @@ -173,7 +173,7 @@ namespace VideoLAN.LibVLC ex.Raise (); } - [DllImport ("libvlc-control.dll", EntryPoint="libvlc_playlist_next")] + [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_next")] static extern void PlaylistNext (InstanceHandle self, NativeException ex); /** Switches to next playlist item, and starts playing it. */ @@ -183,7 +183,7 @@ namespace VideoLAN.LibVLC ex.Raise (); } - [DllImport ("libvlc-control.dll", EntryPoint="libvlc_playlist_prev")] + [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_prev")] static extern void PlaylistPrev (InstanceHandle self, NativeException ex); /** Switches to previous playlist item, and starts playing it. */ @@ -193,7 +193,7 @@ namespace VideoLAN.LibVLC ex.Raise (); } - [DllImport ("libvlc-control.dll", EntryPoint="libvlc_playlist_clear")] + [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_clear")] static extern void PlaylistClear (InstanceHandle self, NativeException ex); /** Clears the whole playlist. */ @@ -207,7 +207,7 @@ namespace VideoLAN.LibVLC items.Clear (); } - [DllImport ("libvlc-control.dll", + [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_add_extended")] static extern int PlaylistAdd (InstanceHandle self, U8String uri, U8String name, int optc, @@ -264,7 +264,7 @@ namespace VideoLAN.LibVLC return Add (mrl, null, new string[0]); } - [DllImport ("libvlc-control.dll", + [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_delete_item")] static extern int PlaylistDelete (InstanceHandle self, int id, NativeException e); @@ -320,13 +320,13 @@ namespace VideoLAN.LibVLC { } - [DllImport ("libvlc-control.dll", + [DllImport ("libvlc.dll", EntryPoint="libvlc_media_new")] public static extern DescriptorHandle Create (InstanceHandle inst, U8String mrl, NativeException ex); - [DllImport ("libvlc-control.dll", + [DllImport ("libvlc.dll", EntryPoint="libvlc_media_release")] public static extern void Release (IntPtr ptr); diff --git a/bindings/cil/tests/testvlc.cs b/bindings/cil/tests/testvlc.cs index 6f139db34b..d8683035f1 100644 --- a/bindings/cil/tests/testvlc.cs +++ b/bindings/cil/tests/testvlc.cs @@ -1,5 +1,5 @@ /* - * testvlc.cs - tests for libvlc-control CIL bindings + * testvlc.cs - tests for libvlc CIL bindings * * $Id$ */ diff --git a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java index 44adeeff29..037b82664f 100644 --- a/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java +++ b/bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java @@ -38,7 +38,7 @@ import com.sun.jna.Union; public interface LibVlc extends Library { - LibVlc INSTANCE = (LibVlc) Native.loadLibrary("vlc-control", LibVlc.class); + LibVlc INSTANCE = (LibVlc) Native.loadLibrary("vlc", LibVlc.class); LibVlc SYNC_INSTANCE = (LibVlc) Native.synchronizedLibrary(INSTANCE); diff --git a/bindings/python/setup.py b/bindings/python/setup.py index a079c10fe1..df71e02c87 100644 --- a/bindings/python/setup.py +++ b/bindings/python/setup.py @@ -71,7 +71,7 @@ def get_cflags(): def get_ldflags(): vlcconfig=get_vlcconfig() if vlcconfig is None: - return [ '-lvlc-control' ] + return [ '-lvlc' ] else: ldflags = [] if os.sys.platform == 'darwin': @@ -81,9 +81,9 @@ def get_ldflags(): if os.sys.platform == 'darwin': ldflags.append('-lstdc++') if not libtool: - # vlc-config is broken and gives a -lvlc-control which + # vlc-config is broken and gives a -lvlc which # does not exist if libtool is disabled. - ldflags.remove('-lvlc-control') + ldflags.remove('-lvlc') return ldflags #source_files = [ 'vlc_module.c', 'vlc_mediacontrol.c', diff --git a/configure.ac b/configure.ac index e8f9a868e2..4b2308c890 100644 --- a/configure.ac +++ b/configure.ac @@ -6291,8 +6291,8 @@ dnl dnl Pic and shared libvlc stuff dnl AS_IF([test "${SYS}" = "mingw32"], [ + FILE_LIBVLCCORE_DLL="!define LIBVLCCORE_DLL libvlccore.dll" FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll" - FILE_LIBVLC_CONTROL_DLL="!define LIBVLC_CONTROL_DLL libvlc-control.dll" ]) dnl @@ -6352,8 +6352,8 @@ AC_SUBST(WINE_SDK_PATH) AC_SUBST(LIBEXT) AC_SUBST(AM_CPPFLAGS) AC_SUBST(MACOSX_DEPLOYMENT_TARGET) +AC_SUBST(FILE_LIBVLCCORE_DLL) AC_SUBST(FILE_LIBVLC_DLL) -AC_SUBST(FILE_LIBVLC_CONTROL_DLL) dnl Create vlc-config.in VLC_OUTPUT_VLC_CONFIG_IN diff --git a/modules/common.am b/modules/common.am index 479b244d7f..1e086960d8 100644 --- a/modules/common.am +++ b/modules/common.am @@ -13,7 +13,7 @@ BUILT_SOURCES = CLEANFILES = $(BUILT_SOURCES) if HAVE_PLUGINS -LTLIBVLC = $(top_builddir)/src/libvlc.la +LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la AM_CFLAGS = `$(VLC_CONFIG) --cflags plugin $@` AM_CXXFLAGS = `$(VLC_CONFIG) --cxxflags plugin $@` @@ -22,7 +22,7 @@ AM_LDFLAGS = -rpath '$(libvlcdir)' \ -avoid-version -module -no-undefined \ -shrext $(LIBEXT) \ `$(VLC_CONFIG) --ldflags plugin $@` -AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` $(LTLIBVLC) +AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` $(LTLIBVLCCORE) if HAVE_COMPILER_EXPORT AM_LDFLAGS += -export-dynamic diff --git a/projects/activex/Makefile.am b/projects/activex/Makefile.am index a0ef44bef9..7c0c8b45ad 100644 --- a/projects/activex/Makefile.am +++ b/projects/activex/Makefile.am @@ -66,8 +66,8 @@ if BUILD_ACTIVEX lib_LTLIBRARIES = axvlc.la -LIBRARIES_libvlc = $(top_builddir)/src/libvlc-control.la \ - $(top_builddir)/src/libvlc.la +LIBRARIES_libvlc = $(top_builddir)/src/libvlc.la \ + $(top_builddir)/src/libvlccore.la axvlc_la_SOURCES = $(SOURCES_activex) axvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags activex` diff --git a/projects/mozilla/Makefile.am b/projects/mozilla/Makefile.am index 0b818b0f71..2876ce37c4 100644 --- a/projects/mozilla/Makefile.am +++ b/projects/mozilla/Makefile.am @@ -23,8 +23,8 @@ DIST_sources = $(SOURCES_mozilla_common) \ if BUILD_MOZILLA -LIBRARIES_libvlc = $(top_builddir)/src/libvlc-control.la \ - $(top_builddir)/src/libvlc.la +LIBRARIES_libvlc = $(top_builddir)/src/libvlc.la \ + $(top_builddir)/src/libvlccore.la if HAVE_WIN32 @@ -111,22 +111,22 @@ VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES) $(INSTALL) -d "$@/Contents/MacOS/lib" $(INSTALL) ".libs/npvlc.dylib" "$@/Contents/MacOS/VLC Plugin" $(INSTALL) -d "$(srcdir)/$@/Contents/MacOS/lib"; \ - install_name_tool -change "$(libdir)/libvlc.1.dylib" \ - "@executable_path/lib/libvlc.dylib" \ + install_name_tool -change "$(libdir)/libvlccore.0.dylib" \ + "@executable_path/lib/libvlccore.dylib" \ "$@/Contents/MacOS/VLC Plugin" - install_name_tool -change "$(libdir)/libvlc-control.1.dylib" \ - "@executable_path/lib/libvlc-control.dylib" \ + install_name_tool -change "$(libdir)/libvlc.2.dylib" \ + "@executable_path/lib/libvlc.dylib" \ "$@/Contents/MacOS/VLC Plugin" - $(INSTALL) "$(top_builddir)/src/.libs/libvlc.1.dylib" \ + $(INSTALL) "$(top_builddir)/src/.libs/libvlccore.0.dylib" \ + "$@/Contents/MacOS/lib/libvlccore.dylib" + $(INSTALL) "$(top_builddir)/src/.libs/libvlc.2.dylib" \ + "$@/Contents/MacOS/lib/libvlc.dylib" + install_name_tool -change "$(libdir)/libvlccore.0.dylib" \ + "@executable_path/lib/libvlccore.dylib" \ "$@/Contents/MacOS/lib/libvlc.dylib" - $(INSTALL) "$(top_builddir)/src/.libs/libvlc-control.1.dylib" \ - "$@/Contents/MacOS/lib/libvlc-control.dylib" - install_name_tool -change "$(libdir)/libvlc.1.dylib" \ - "@executable_path/lib/libvlc.dylib" \ - "$@/Contents/MacOS/lib/libvlc-control.dylib" dylib="$@/Contents/MacOS/VLC Plugin"; $(FIXEXECPATH) ; + dylib="$@/Contents/MacOS/lib/libvlccore.dylib"; $(FIXEXECPATH) ; dylib="$@/Contents/MacOS/lib/libvlc.dylib"; $(FIXEXECPATH) ; - dylib="$@/Contents/MacOS/lib/libvlc-control.dylib"; $(FIXEXECPATH) ; $(INSTALL) -d "$@/Contents/Resources" $(INSTALL) npvlc.rsrc "$@/Contents/Resources/VLC Plugin.rsrc" cp -r "$(top_srcdir)/extras/package/macosx/plugin/English.lproj" "$@/Contents/Resources/" @@ -137,8 +137,8 @@ VLC\ Plugin.plugin: npvlc.rsrc $(lib_LTLIBRARIES) if test -n "$$i" ; then \ dylib="$@/Contents/MacOS/modules/`basename $$i`"; \ $(INSTALL) "$$i" "$$dylib"; \ - install_name_tool -change "$(libdir)/libvlc.1.dylib" \ - "@executable_path/lib/libvlc.dylib" "$$dylib"; \ + install_name_tool -change "$(libdir)/libvlccore.0.dylib" \ + "@executable_path/lib/libvlccore.dylib" "$$dylib"; \ $(FIXEXECPATH) ; \ fi ; \ done diff --git a/src/Makefile.am b/src/Makefile.am index aefa6ce3c6..ad9a0892fc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -8,7 +8,7 @@ NULL = EXTRA_DIST = extras/COPYING modules/builtin.h.in \ vlc-control.pc.in \ vlc-plugin.pc.in \ - libvlc.sym + libvlccore.sym BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h CLEANFILES = $(BUILT_SOURCES) @@ -159,47 +159,46 @@ CLEANFILES += $(pkgconfig_DATA) nice: $(top_builddir)/compile -lib_LTLIBRARIES = libvlc.la libvlc-control.la +lib_LTLIBRARIES = libvlccore.la libvlc.la AM_LDFLAGS = -no-undefined -no-install if HAVE_WIN32 AM_LDFLAGS += -avoid-version endif -libvlc_la_SOURCES = $(SOURCES_libvlc) -nodist_libvlc_la_SOURCES = misc/revision.c -libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ +libvlccore_la_SOURCES = $(SOURCES_libvlc) +nodist_libvlccore_la_SOURCES = misc/revision.c +libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ -DMODULE_STRING=\"main\" \ -DLOCALEDIR=\"$(localedir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DDATA_PATH=\"$(pkgdatadir)\" \ -DLIBDIR=\"$(libdir)\" \ -DPLUGIN_PATH=\"$(pkglibdir)\" -libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc` -libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc` -libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \ - -version-info 1:0:0 +libvlccore_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc` +libvlccore_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc` +libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \ + -version-info 0:0:0 if HAVE_COMPILER_EXPORT -libvlc_la_LDFLAGS += -export-dynamic +libvlccore_la_LDFLAGS += -export-dynamic else -libvlc_la_LDFLAGS += -export-symbols $(srcdir)/libvlc.sym +libvlccore_la_LDFLAGS += -export-symbols $(srcdir)/libvlccore.sym endif -libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL) - -libvlc_la_DEPENDENCIES = libvlc.sym +libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL) +libvlccore_la_DEPENDENCIES = libvlccore.sym -libvlc_control_la_SOURCES = $(SOURCES_libvlc_control) -libvlc_control_la_LIBADD = libvlc.la -libvlc_control_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ +libvlc_la_SOURCES = $(SOURCES_libvlc_control) +libvlc_la_LIBADD = libvlccore.la +libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ -DMODULE_STRING=\"control\" -libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 +libvlc_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:0 if HAVE_COMPILER_EXPORT -libvlc_control_la_LDFLAGS += -export-dynamic +libvlc_la_LDFLAGS += -export-dynamic else -libvlc_control_la_LDFLAGS += -export-symbols-regex '^_?(libvlc|mediacontrol)_.*' +libvlc_la_LDFLAGS += -export-symbols-regex '^_?(libvlc|mediacontrol)_.*' endif -EXTRA_libvlc_la_SOURCES = \ +EXTRA_libvlccore_la_SOURCES = \ $(SOURCES_libvlc_beos) \ $(SOURCES_libvlc_darwin) \ $(SOURCES_libvlc_linux) \ @@ -210,34 +209,34 @@ EXTRA_libvlc_la_SOURCES = \ $(SOURCES_libvlc_sout) \ $(NULL) if HAVE_BEOS -libvlc_la_SOURCES += $(SOURCES_libvlc_beos) +libvlccore_la_SOURCES += $(SOURCES_libvlc_beos) else if HAVE_DARWIN -libvlc_la_SOURCES += $(SOURCES_libvlc_darwin) +libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin) else if HAVE_LINUX -libvlc_la_SOURCES += $(SOURCES_libvlc_linux) +libvlccore_la_SOURCES += $(SOURCES_libvlc_linux) else if HAVE_WIN32 -libvlc_la_SOURCES += $(SOURCES_libvlc_win32) +libvlccore_la_SOURCES += $(SOURCES_libvlc_win32) else if HAVE_WINCE -libvlc_la_SOURCES += $(SOURCES_libvlc_win32) +libvlccore_la_SOURCES += $(SOURCES_libvlc_win32) else -libvlc_la_SOURCES += $(SOURCES_libvlc_other) +libvlccore_la_SOURCES += $(SOURCES_libvlc_other) endif endif endif endif endif if BUILD_DIRENT -libvlc_la_SOURCES += $(SOURCES_libvlc_dirent) +libvlccore_la_SOURCES += $(SOURCES_libvlc_dirent) endif if BUILD_GETOPT -libvlc_la_SOURCES += $(SOURCES_libvlc_getopt) +libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt) endif if ENABLE_SOUT -libvlc_la_SOURCES += $(SOURCES_libvlc_sout) +libvlccore_la_SOURCES += $(SOURCES_libvlc_sout) endif SOURCES_libvlc_beos = \ @@ -440,7 +439,8 @@ vlc_DEPENDENCIES = $(DATA_win32_rc) libvlc.la vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc` -vlc_LDADD = $(DATA_win32_rc) libvlc.la $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc` +vlc_LDADD = $(DATA_win32_rc) libvlccore.la $(LTLIBINTL) \ + `$(VLC_CONFIG) -libs vlc` if BUILD_VLC vlc$(EXEEXT): $(vlc_OBJECTS) $(vlc_DEPENDENCIES) diff --git a/src/libvlc.sym b/src/libvlccore.sym similarity index 100% rename from src/libvlc.sym rename to src/libvlccore.sym diff --git a/src/vlc-control.pc.in b/src/vlc-control.pc.in index 5d60c2af91..fa3e0f3ad6 100644 --- a/src/vlc-control.pc.in +++ b/src/vlc-control.pc.in @@ -7,5 +7,5 @@ Name: LibVLC control API Description: VLC media player external control library Version: @VERSION@ Cflags: -I${includedir} -Libs: -L${libdir} -lvlc-control -Libs.private: -lvlc +Libs: -L${libdir} -lvlc +Libs.private: -lvlccore diff --git a/src/vlc-plugin.pc.in b/src/vlc-plugin.pc.in index a00711a392..9adeb738b5 100644 --- a/src/vlc-plugin.pc.in +++ b/src/vlc-plugin.pc.in @@ -12,4 +12,4 @@ Cflags: -I${includedir} -I${includedir}/vlc/plugins \ -D_LARGEFILE64_SOURCE \ -D_REENTRANT \ -D_THREAD_SAFE -Libs: -L${libdir} -lvlc +Libs: -L${libdir} -lvlccore