Changeset 84d0f814c4aaeb01141e993879de1ce8b0c7fedb

Show
Ignore:
Timestamp:
05/15/08 18:40:44 (2 months ago)
Author:
Rémi Denis-Courmont <rem@videolan.org>
git-committer:
Rémi Denis-Courmont <rem@videolan.org> 1210869644 +0300
git-parent:

[703887976e34ccdfa64d31079973bfb97fc93db1]

git-author:
Rémi Denis-Courmont <rem@videolan.org> 1210869644 +0300
Message:

Rename the shared libraries

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • Makefile.am

    r492c2c6 r84d0f81  
    310310# Don't complain if it doesn't work. -- Courmisch 
    311311libvlc: 
    312     cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la 
     312    cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la 
    313313 
    314314core: 
    …… 
    672672    cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/" 
    673673    cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/" 
     674    cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "vlc-$(VERSION)/" 
    674675    cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/" 
    675     cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-$(VERSION)/" 
    676676 
    677677    for file in AUTHORS MAINTAINERS THANKS ; \ 
    …… 
    775775package-win-common-strip: 
    776776    $(STRIP) "$(top_builddir)/vlc-$(VERSION)/vlc$(EXEEXT)" 
     777    $(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)" 
    777778    $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)" 
    778     $(STRIP) "vlc-$(VERSION)/libvlc-control$(LIBEXT)" 
    779779if BUILD_MOZILLA 
    780780    $(STRIP) $(top_builddir)/vlc-$(VERSION)/mozilla/npvlc$(LIBEXT); 

  • bindings/cil/src/exception.cs

    r66af5fd r84d0f81  
    11/* 
    2  * libvlc.cs - libvlc-control CIL bindings 
     2 * libvlc.cs - libvlc CIL bindings 
    33 * 
    44 * $Id$ 
    …… 
    6969        IntPtr message; 
    7070 
    71         [DllImport ("libvlc-control.dll", EntryPoint="libvlc_exception_init")] 
     71        [DllImport ("libvlc.dll", EntryPoint="libvlc_exception_init")] 
    7272        static extern void Init (NativeException e); 
    73         [DllImport ("libvlc-control.dll", EntryPoint="libvlc_exception_clear")] 
     73        [DllImport ("libvlc.dll", EntryPoint="libvlc_exception_clear")] 
    7474        static extern void Clear (NativeException e); 
    75         /*[DllImport ("libvlc-control.dll", 
     75        /*[DllImport ("libvlc.dll", 
    7676                    EntryPoint="libvlc_exception_raised")] 
    7777        static extern int Raised (NativeException e);*/ 
    78         [DllImport ("libvlc-control.dll", 
     78        [DllImport ("libvlc.dll", 
    7979                    EntryPoint="libvlc_exception_get_message")] 
    8080        static extern IntPtr GetMessage (NativeException e); 

  • bindings/cil/src/libvlc.cs

    rbf1292e r84d0f81  
    11/** 
    22 * @file libvlc.cs 
    3  * @brief libvlc-control CIL bindings 
     3 * @brief libvlc CIL bindings 
    44 * 
    55 * $Id$ 
    …… 
    7272        } 
    7373 
    74         [DllImport ("libvlc-control.dll", EntryPoint="libvlc_new")] 
     74        [DllImport ("libvlc.dll", EntryPoint="libvlc_new")] 
    7575        internal static extern 
    7676        InstanceHandle Create (int argc, U8String[] argv, NativeException ex); 
    7777 
    78         [DllImport ("libvlc-control.dll", EntryPoint="libvlc_release")] 
     78        [DllImport ("libvlc.dll", EntryPoint="libvlc_release")] 
    7979        static extern void Destroy (IntPtr ptr, NativeException ex); 
    8080 
    …… 
    116116        } 
    117117 
    118         [DllImport ("libvlc-control.dll", EntryPoint="libvlc_playlist_loop")] 
     118        [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_loop")] 
    119119        static extern void PlaylistLoop (InstanceHandle self, bool b, 
    120120                                         NativeException ex); 
    …… 
    129129        } 
    130130 
    131         [DllImport ("libvlc-control.dll", EntryPoint="libvlc_playlist_play")] 
     131        [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_play")] 
    132132        static extern void PlaylistPlay (InstanceHandle self, int id, int optc, 
    133133                                         U8String[] optv, NativeException ex); 
    …… 
    139139        } 
    140140 
    141         [DllImport ("libvlc-control.dll", EntryPoint="libvlc_playlist_pause")] 
     141        [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_pause")] 
    142142        static extern void PlaylistPause (InstanceHandle self, 
    143143                                          NativeException ex); 
    …… 
    149149        } 
    150150 
    151         [DllImport ("libvlc-control.dll", 
     151        [DllImport ("libvlc.dll", 
    152152                    EntryPoint="libvlc_playlist_isplaying")] 
    153153        static extern int PlaylistIsPlaying (InstanceHandle self, 
    …… 
    164164        } 
    165165 
    166         [DllImport ("libvlc-control.dll", EntryPoint="libvlc_playlist_stop")] 
     166        [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_stop")] 
    167167        static extern void PlaylistStop (InstanceHandle self, 
    168168                                         NativeException ex); 
    …… 
    174174        } 
    175175 
    176         [DllImport ("libvlc-control.dll", EntryPoint="libvlc_playlist_next")] 
     176        [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_next")] 
    177177        static extern void PlaylistNext (InstanceHandle self, 
    178178                                         NativeException ex); 
    …… 
    184184        } 
    185185 
    186         [DllImport ("libvlc-control.dll", EntryPoint="libvlc_playlist_prev")] 
     186        [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_prev")] 
    187187        static extern void PlaylistPrev (InstanceHandle self, 
    188188                                         NativeException ex); 
    …… 
    194194        } 
    195195 
    196         [DllImport ("libvlc-control.dll", EntryPoint="libvlc_playlist_clear")] 
     196        [DllImport ("libvlc.dll", EntryPoint="libvlc_playlist_clear")] 
    197197        static extern void PlaylistClear (InstanceHandle self, 
    198198                                          NativeException ex); 
    …… 
    208208        } 
    209209 
    210         [DllImport ("libvlc-control.dll", 
     210        [DllImport ("libvlc.dll", 
    211211                    EntryPoint="libvlc_playlist_add_extended")] 
    212212        static extern int PlaylistAdd (InstanceHandle self, U8String uri, 
    …… 
    265265        } 
    266266 
    267         [DllImport ("libvlc-control.dll", 
     267        [DllImport ("libvlc.dll", 
    268268                    EntryPoint="libvlc_playlist_delete_item")] 
    269269        static extern int PlaylistDelete (InstanceHandle self, int id, 
    …… 
    321321        } 
    322322 
    323         [DllImport ("libvlc-control.dll", 
     323        [DllImport ("libvlc.dll", 
    324324                    EntryPoint="libvlc_media_new")] 
    325325        public static extern 
    …… 
    327327                                 NativeException ex); 
    328328 
    329         [DllImport ("libvlc-control.dll", 
     329        [DllImport ("libvlc.dll", 
    330330                    EntryPoint="libvlc_media_release")] 
    331331        public static extern void Release (IntPtr ptr); 

  • bindings/cil/tests/testvlc.cs

    ra2aa6ae r84d0f81  
    11/* 
    2  * testvlc.cs - tests for libvlc-control CIL bindings 
     2 * testvlc.cs - tests for libvlc CIL bindings 
    33 * 
    44 * $Id$ 

  • bindings/java/core/src/main/java/org/videolan/jvlc/internal/LibVlc.java

    r88ff21f r84d0f81  
    3939{ 
    4040 
    41     LibVlc INSTANCE = (LibVlc) Native.loadLibrary("vlc-control", LibVlc.class); 
     41    LibVlc INSTANCE = (LibVlc) Native.loadLibrary("vlc", LibVlc.class); 
    4242 
    4343    LibVlc SYNC_INSTANCE = (LibVlc) Native.synchronizedLibrary(INSTANCE); 

  • bindings/python/setup.py

    r03dbdfe r84d0f81  
    7272    vlcconfig=get_vlcconfig() 
    7373    if vlcconfig is None: 
    74         return [ '-lvlc-control' ] 
     74        return [ '-lvlc' ] 
    7575    else: 
    7676    ldflags = [] 
    …… 
    8282        ldflags.append('-lstdc++') 
    8383        if not libtool: 
    84             # vlc-config is broken and gives a -lvlc-control which 
     84            # vlc-config is broken and gives a -lvlc which 
    8585            # does not exist if libtool is disabled. 
    86             ldflags.remove('-lvlc-control') 
     86            ldflags.remove('-lvlc') 
    8787        return ldflags 
    8888 

  • configure.ac

    r3e1fea3 r84d0f81  
    62926292dnl 
    62936293AS_IF([test "${SYS}" = "mingw32"], [ 
     6294  FILE_LIBVLCCORE_DLL="!define LIBVLCCORE_DLL libvlccore.dll" 
    62946295  FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll" 
    6295   FILE_LIBVLC_CONTROL_DLL="!define LIBVLC_CONTROL_DLL libvlc-control.dll" 
    62966296]) 
    62976297 
    …… 
    63536353AC_SUBST(AM_CPPFLAGS) 
    63546354AC_SUBST(MACOSX_DEPLOYMENT_TARGET) 
     6355AC_SUBST(FILE_LIBVLCCORE_DLL) 
    63556356AC_SUBST(FILE_LIBVLC_DLL) 
    6356 AC_SUBST(FILE_LIBVLC_CONTROL_DLL) 
    63576357 
    63586358dnl Create vlc-config.in 

  • modules/common.am

    r32fcb079 r84d0f81  
    1414 
    1515if HAVE_PLUGINS 
    16 LTLIBVLC = $(top_builddir)/src/libvlc.la 
     16LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la 
    1717 
    1818AM_CFLAGS = `$(VLC_CONFIG) --cflags plugin $@` 
    …… 
    2323    -shrext $(LIBEXT) \ 
    2424     `$(VLC_CONFIG) --ldflags plugin $@` 
    25 AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` $(LTLIBVLC) 
     25AM_LIBADD = `$(VLC_CONFIG) -libs plugin $@` $(LTLIBVLCCORE) 
    2626 
    2727if HAVE_COMPILER_EXPORT 

  • projects/activex/Makefile.am

    r2e888fd r84d0f81  
    6767lib_LTLIBRARIES = axvlc.la 
    6868 
    69 LIBRARIES_libvlc = $(top_builddir)/src/libvlc-control.la \ 
    70                    $(top_builddir)/src/libvlc.la 
     69LIBRARIES_libvlc = $(top_builddir)/src/libvlc.la \ 
     70                   $(top_builddir)/src/libvlccore.la 
    7171 
    7272axvlc_la_SOURCES = $(SOURCES_activex) 

  • projects/mozilla/Makefile.am

    raec97d0 r84d0f81  
    2424if BUILD_MOZILLA 
    2525 
    26 LIBRARIES_libvlc = $(top_builddir)/src/libvlc-control.la \ 
    27                    $(top_builddir)/src/libvlc.la 
     26LIBRARIES_libvlc = $(top_builddir)/src/libvlc.la \ 
     27                   $(top_builddir)/src/libvlccore.la 
    2828 
    2929if HAVE_WIN32 
    …… 
    112112    $(INSTALL) ".libs/npvlc.dylib" "$@/Contents/MacOS/VLC Plugin" 
    113113    $(INSTALL) -d "$(srcdir)/$@/Contents/MacOS/lib"; \ 
    114     install_name_tool -change "$(libdir)/libvlc.1.dylib" \ 
     114    install_name_tool -change "$(libdir)/libvlccore.0.dylib" \ 
     115        "@executable_path/lib/libvlccore.dylib" \ 
     116        "$@/Contents/MacOS/VLC Plugin" 
     117    install_name_tool -change "$(libdir)/libvlc.2.dylib" \ 
    115118        "@executable_path/lib/libvlc.dylib" \ 
    116119        "$@/Contents/MacOS/VLC Plugin" 
    117     install_name_tool -change "$(libdir)/libvlc-control.1.dylib" \ 
    118         "@executable_path/lib/libvlc-control.dylib" \ 
    119         "$@/Contents/MacOS/VLC Plugin" 
    120     $(INSTALL) "$(top_builddir)/src/.libs/libvlc.1.dylib" \ 
     120    $(INSTALL) "$(top_builddir)/src/.libs/libvlccore.0.dylib" \ 
     121        "$@/Contents/MacOS/lib/libvlccore.dylib" 
     122    $(INSTALL) "$(top_builddir)/src/.libs/libvlc.2.dylib" \ 
    121123        "$@/Contents/MacOS/lib/libvlc.dylib" 
    122     $(INSTALL) "$(top_builddir)/src/.libs/libvlc-control.1.dylib" \ 
    123         "$@/Contents/MacOS/lib/libvlc-control.dylib" 
    124     install_name_tool -change "$(libdir)/libvlc.1.dylib" \ 
    125         "@executable_path/lib/libvlc.dylib" \ 
    126         "$@/Contents/MacOS/lib/libvlc-control.dylib" 
     124    install_name_tool -change "$(libdir)/libvlccore.0.dylib" \ 
     125        "@executable_path/lib/libvlccore.dylib" \ 
     126        "$@/Contents/MacOS/lib/libvlc.dylib" 
    127127    dylib="$@/Contents/MacOS/VLC Plugin"; $(FIXEXECPATH) ; 
     128    dylib="$@/Contents/MacOS/lib/libvlccore.dylib"; $(FIXEXECPATH) ; 
    128129    dylib="$@/Contents/MacOS/lib/libvlc.dylib"; $(FIXEXECPATH) ; 
    129     dylib="$@/Contents/MacOS/lib/libvlc-control.dylib"; $(FIXEXECPATH) ; 
    130130    $(INSTALL) -d "$@/Contents/Resources" 
    131131    $(INSTALL) npvlc.rsrc "$@/Contents/Resources/VLC Plugin.rsrc" 
    …… 
    138138        dylib="$@/Contents/MacOS/modules/`basename $$i`"; \ 
    139139        $(INSTALL) "$$i" "$$dylib"; \ 
    140         install_name_tool -change "$(libdir)/libvlc.1.dylib" \ 
    141             "@executable_path/lib/libvlc.dylib" "$$dylib"; \ 
     140        install_name_tool -change "$(libdir)/libvlccore.0.dylib" \ 
     141            "@executable_path/lib/libvlccore.dylib" "$$dylib"; \ 
    142142        $(FIXEXECPATH) ; \ 
    143143      fi ; \ 

  • src/Makefile.am

    r8e18f5c r84d0f81  
    99    vlc-control.pc.in \ 
    1010    vlc-plugin.pc.in \ 
    11     libvlc.sym 
     11    libvlccore.sym 
    1212 
    1313BUILT_SOURCES = modules/builtin.h misc/revision.c ../include/vlc_about.h 
    …… 
    160160    $(top_builddir)/compile 
    161161 
    162 lib_LTLIBRARIES = libvlc.la libvlc-control.la 
     162lib_LTLIBRARIES = libvlccore.la libvlc.la 
    163163 
    164164AM_LDFLAGS = -no-undefined -no-install 
    …… 
    167167endif 
    168168 
    169 libvlc_la_SOURCES = $(SOURCES_libvlc) 
    170 nodist_libvlc_la_SOURCES = misc/revision.c 
    171 libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ 
     169libvlccore_la_SOURCES = $(SOURCES_libvlc) 
     170nodist_libvlccore_la_SOURCES = misc/revision.c 
     171libvlccore_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ 
    172172    -DMODULE_STRING=\"main\" \ 
    173173    -DLOCALEDIR=\"$(localedir)\" \ 
    …… 
    176176    -DLIBDIR=\"$(libdir)\" \ 
    177177    -DPLUGIN_PATH=\"$(pkglibdir)\" 
    178 libvlc_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc` 
    179 libvlc_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc` 
    180 libvlc_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \ 
    181     -version-info 1:0:0 
     178libvlccore_la_CXXFLAGS = `$(VLC_CONFIG) --cxxflags libvlc` 
     179libvlccore_la_OBJCFLAGS = `$(VLC_CONFIG) --objcflags libvlc` 
     180libvlccore_la_LDFLAGS = `$(VLC_CONFIG) --ldflags libvlc` $(AM_LDFLAGS) \ 
     181    -version-info 0:0:0 
     182if HAVE_COMPILER_EXPORT 
     183libvlccore_la_LDFLAGS += -export-dynamic 
     184else 
     185libvlccore_la_LDFLAGS += -export-symbols $(srcdir)/libvlccore.sym  
     186endif 
     187libvlccore_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL) 
     188libvlccore_la_DEPENDENCIES = libvlccore.sym 
     189 
     190libvlc_la_SOURCES = $(SOURCES_libvlc_control) 
     191libvlc_la_LIBADD = libvlccore.la 
     192libvlc_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ 
     193    -DMODULE_STRING=\"control\" 
     194libvlc_la_LDFLAGS = $(AM_LDFLAGS) -version-info 2:0:0 
    182195if HAVE_COMPILER_EXPORT 
    183196libvlc_la_LDFLAGS += -export-dynamic 
    184197else 
    185 libvlc_la_LDFLAGS += -export-symbols $(srcdir)/libvlc.sym  
    186 endif 
    187 libvlc_la_LIBADD = `$(VLC_CONFIG) -libs libvlc` $(AM_LIBADD) $(LTLIBINTL) 
    188  
    189 libvlc_la_DEPENDENCIES = libvlc.sym 
    190  
    191 libvlc_control_la_SOURCES = $(SOURCES_libvlc_control) 
    192 libvlc_control_la_LIBADD = libvlc.la 
    193 libvlc_control_la_CFLAGS = `$(VLC_CONFIG) --cflags libvlc` \ 
    194     -DMODULE_STRING=\"control\" 
    195 libvlc_control_la_LDFLAGS = $(AM_LDFLAGS) -version-info 1:0:0 
    196 if HAVE_COMPILER_EXPORT 
    197 libvlc_control_la_LDFLAGS += -export-dynamic 
    198 else 
    199 libvlc_control_la_LDFLAGS += -export-symbols-regex '^_?(libvlc|mediacontrol)_.*' 
    200 endif 
    201  
    202 EXTRA_libvlc_la_SOURCES = \ 
     198libvlc_la_LDFLAGS += -export-symbols-regex '^_?(libvlc|mediacontrol)_.*' 
     199endif 
     200 
     201EXTRA_libvlccore_la_SOURCES = \ 
    203202    $(SOURCES_libvlc_beos) \ 
    204203    $(SOURCES_libvlc_darwin) \ 
    …… 
    211210    $(NULL) 
    212211if HAVE_BEOS 
    213 libvlc_la_SOURCES += $(SOURCES_libvlc_beos) 
     212libvlccore_la_SOURCES += $(SOURCES_libvlc_beos) 
    214213else 
    215214if HAVE_DARWIN 
    216 libvlc_la_SOURCES += $(SOURCES_libvlc_darwin) 
     215libvlccore_la_SOURCES += $(SOURCES_libvlc_darwin) 
    217216else 
    218217if HAVE_LINUX 
    219 libvlc_la_SOURCES += $(SOURCES_libvlc_linux) 
     218libvlccore_la_SOURCES += $(SOURCES_libvlc_linux) 
    220219else 
    221220if HAVE_WIN32 
    222 libvlc_la_SOURCES += $(SOURCES_libvlc_win32) 
     221libvlccore_la_SOURCES += $(SOURCES_libvlc_win32) 
    223222else 
    224223if HAVE_WINCE 
    225 libvlc_la_SOURCES += $(SOURCES_libvlc_win32) 
    226 else 
    227 libvlc_la_SOURCES += $(SOURCES_libvlc_other) 
     224libvlccore_la_SOURCES += $(SOURCES_libvlc_win32) 
     225else 
     226libvlccore_la_SOURCES += $(SOURCES_libvlc_other) 
    228227endif 
    229228endif 
    …… 
    232231endif 
    233232if BUILD_DIRENT 
    234 libvlc_la_SOURCES += $(SOURCES_libvlc_dirent) 
     233libvlccore_la_SOURCES += $(SOURCES_libvlc_dirent) 
    235234endif 
    236235if BUILD_GETOPT 
    237 libvlc_la_SOURCES += $(SOURCES_libvlc_getopt) 
     236libvlccore_la_SOURCES += $(SOURCES_libvlc_getopt) 
    238237endif 
    239238if ENABLE_SOUT 
    240 libvlc_la_SOURCES += $(SOURCES_libvlc_sout) 
     239libvlccore_la_SOURCES += $(SOURCES_libvlc_sout) 
    241240endif 
    242241 
    …… 
    441440vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc` 
    442441vlc_LDFLAGS = `$(VLC_CONFIG) --ldflags vlc` 
    443 vlc_LDADD = $(DATA_win32_rc) libvlc.la $(LTLIBINTL) `$(VLC_CONFIG) -libs vlc` 
     442vlc_LDADD = $(DATA_win32_rc) libvlccore.la $(LTLIBINTL) \ 
     443    `$(VLC_CONFIG) -libs vlc` 
    444444 
    445445if BUILD_VLC 

  • src/vlc-control.pc.in

    rf8c4e77 r84d0f81  
    88Version: @VERSION@ 
    99Cflags: -I${includedir} 
    10 Libs: -L${libdir} -lvlc-control 
    11 Libs.private: -lvlc 
     10Libs: -L${libdir} -lvlc 
     11Libs.private: -lvlccore 

  • src/vlc-plugin.pc.in

    r4d96b2a r84d0f81  
    1313    -D_REENTRANT \ 
    1414    -D_THREAD_SAFE 
    15 Libs: -L${libdir} -lvlc 
     15Libs: -L${libdir} -lvlccore