From: Rémi Denis-Courmont Date: Tue, 30 Aug 2011 20:40:14 +0000 (+0300) Subject: Move src/control/ to lib/ X-Git-Tag: 1.2.0-pre1~934 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=7dcac68447be650214d3d0adfa49c3454d342234;p=vlc Move src/control/ to lib/ --- diff --git a/Makefile.am b/Makefile.am index b5de587273..a415dd106f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,10 +7,8 @@ # which have makefiles with distribution information. # - src (libvlc) is nedeed by modules # - libs/* are needed by modules -DIST_SUBDIRS = \ - m4 compat doc po share src \ - bin modules test -SUBDIRS = compat doc po share src +DIST_SUBDIRS = m4 compat doc po share src modules lib bin test +SUBDIRS = compat doc po share src lib if BUILD_VLC SUBDIRS += bin endif @@ -347,8 +345,11 @@ MAINTAINERCLEANFILES = ChangeLog libcompat: cd compat && $(MAKE) $(AM_MAKEFLAGS) -libvlc: libcompat - cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la +libvlccore: libcompat + cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la + +libvlc: libvlccore + cd lib && $(MAKE) $(AM_MAKEFLAGS) libvlc.la core: libvlc vlc$(EXEEXT) cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT) diff --git a/bin/Makefile.am b/bin/Makefile.am index 85b8a8b570..7c40a971b1 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -31,7 +31,6 @@ endif vlc_wrapper_SOURCES = rootwrap.c vlc_wrapper_LDADD = $(SOCKET_LIBS) -vlc_DEPENDENCIES = ../src/libvlc.sym vlc_LDFLAGS = $(LDFLAGS_vlc) vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la $(LIBS_vlc) @@ -46,7 +45,7 @@ vlc_static_LDFLAGS = $(vlc_LDFLAGS) if HAVE_WIN32 vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT) -vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT) +vlc_DEPENDENCIES = vlc_win32_rc.$(OBJEXT) else vlc_LDADD += $(LIBDL) vlc_static_LDFLAGS += -no-install -static diff --git a/configure.ac b/configure.ac index 781db98319..bcd74f4cec 100644 --- a/configure.ac +++ b/configure.ac @@ -4266,6 +4266,7 @@ AC_CONFIG_FILES([ compat/Makefile src/Makefile src/test/Makefile + lib/Makefile bin/Makefile test/Makefile modules/access/Makefile diff --git a/include/vlc/libvlc_events.h b/include/vlc/libvlc_events.h index ec2f984c04..7b29541c1d 100644 --- a/include/vlc/libvlc_events.h +++ b/include/vlc/libvlc_events.h @@ -45,7 +45,7 @@ extern "C" { enum libvlc_event_e { /* Append new event types at the end of a category. * Do not remove, insert or re-order any entry. - * Keep this in sync with src/control/event.c:libvlc_event_type_name(). */ + * Keep this in sync with lib/event.c:libvlc_event_type_name(). */ libvlc_MediaMetaChanged=0, libvlc_MediaSubItemAdded, libvlc_MediaDurationChanged, diff --git a/src/control/audio.c b/lib/audio.c similarity index 100% rename from src/control/audio.c rename to lib/audio.c diff --git a/src/control/core.c b/lib/core.c similarity index 100% rename from src/control/core.c rename to lib/core.c diff --git a/src/control/error.c b/lib/error.c similarity index 100% rename from src/control/error.c rename to lib/error.c diff --git a/src/control/event.c b/lib/event.c similarity index 100% rename from src/control/event.c rename to lib/event.c diff --git a/src/control/event_async.c b/lib/event_async.c similarity index 100% rename from src/control/event_async.c rename to lib/event_async.c diff --git a/src/control/event_internal.h b/lib/event_internal.h similarity index 100% rename from src/control/event_internal.h rename to lib/event_internal.h diff --git a/src/libvlc.pc.in b/lib/libvlc.pc.in similarity index 100% rename from src/libvlc.pc.in rename to lib/libvlc.pc.in diff --git a/src/libvlc.sym b/lib/libvlc.sym similarity index 100% rename from src/libvlc.sym rename to lib/libvlc.sym diff --git a/src/control/libvlc_internal.h b/lib/libvlc_internal.h similarity index 100% rename from src/control/libvlc_internal.h rename to lib/libvlc_internal.h diff --git a/src/control/log.c b/lib/log.c similarity index 100% rename from src/control/log.c rename to lib/log.c diff --git a/src/control/media.c b/lib/media.c similarity index 99% rename from src/control/media.c rename to lib/media.c index b6668329d1..03f49df5a0 100644 --- a/src/control/media.c +++ b/lib/media.c @@ -38,7 +38,7 @@ #include /* For the preparser */ #include -#include "libvlc.h" +#include "../src/libvlc.h" #include "libvlc_internal.h" #include "media_internal.h" diff --git a/src/control/media_discoverer.c b/lib/media_discoverer.c similarity index 100% rename from src/control/media_discoverer.c rename to lib/media_discoverer.c diff --git a/src/control/media_internal.h b/lib/media_internal.h similarity index 100% rename from src/control/media_internal.h rename to lib/media_internal.h diff --git a/src/control/media_library.c b/lib/media_library.c similarity index 100% rename from src/control/media_library.c rename to lib/media_library.c diff --git a/src/control/media_list.c b/lib/media_list.c similarity index 100% rename from src/control/media_list.c rename to lib/media_list.c diff --git a/src/control/media_list_internal.h b/lib/media_list_internal.h similarity index 100% rename from src/control/media_list_internal.h rename to lib/media_list_internal.h diff --git a/src/control/media_list_path.h b/lib/media_list_path.h similarity index 100% rename from src/control/media_list_path.h rename to lib/media_list_path.h diff --git a/src/control/media_list_player.c b/lib/media_list_player.c similarity index 100% rename from src/control/media_list_player.c rename to lib/media_list_player.c diff --git a/src/control/media_player.c b/lib/media_player.c similarity index 99% rename from src/control/media_player.c rename to lib/media_player.c index 83667b7406..4b4073075e 100644 --- a/src/control/media_player.c +++ b/lib/media_player.c @@ -36,8 +36,6 @@ #include #include -#include "libvlc.h" - #include "libvlc_internal.h" #include "media_internal.h" // libvlc_media_set_state() #include "media_player_internal.h" diff --git a/src/control/media_player_internal.h b/lib/media_player_internal.h similarity index 100% rename from src/control/media_player_internal.h rename to lib/media_player_internal.h diff --git a/src/control/playlist.c b/lib/playlist.c similarity index 98% rename from src/control/playlist.c rename to lib/playlist.c index 72a78f264e..72505522ff 100644 --- a/src/control/playlist.c +++ b/lib/playlist.c @@ -26,7 +26,7 @@ #endif #include "libvlc_internal.h" -#include "libvlc.h" +#include "../src/libvlc.h" #include #include diff --git a/src/control/video.c b/lib/video.c similarity index 100% rename from src/control/video.c rename to lib/video.c diff --git a/src/control/vlm.c b/lib/vlm.c similarity index 100% rename from src/control/vlm.c rename to lib/vlm.c diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp index bd8d1a08a7..8f3cd21ddd 100644 --- a/modules/gui/qt4/qt4.cpp +++ b/modules/gui/qt4/qt4.cpp @@ -322,7 +322,7 @@ static bool active = false; #ifdef Q_WS_MAC /* Used to abort the app.exec() on OSX after libvlc_Quit is called */ -#include "../../../src/control/libvlc_internal.h" /* libvlc_SetExitHandler */ +#include "../../../lib/libvlc_internal.h" /* libvlc_SetExitHandler */ static void Abort( void *obj ) { QVLCApp::triggerQuit(); diff --git a/po/POTFILES.in b/po/POTFILES.in index a0b6fdb714..bc0b1da2d7 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -78,21 +78,6 @@ src/config/core.c src/config/file.c src/config/help.c src/config/intf.c -src/control/audio.c -src/control/core.c -src/control/event.c -src/control/libvlc_internal.h -src/control/log.c -src/control/media.c -src/control/media_discoverer.c -src/control/media_library.c -src/control/media_list.c -src/control/media_list_path.h -src/control/media_list_player.c -src/control/media_player.c -src/control/playlist.c -src/control/video.c -src/control/vlm.c src/extras/libc.c src/extras/tdestroy.c src/input/access.c @@ -184,6 +169,22 @@ src/video_output/vout_internal.h src/video_output/vout_intf.c src/video_output/vout_subpictures.c +lib/audio.c +lib/core.c +lib/event.c +lib/libvlc_internal.h +lib/log.c +lib/media.c +lib/media_discoverer.c +lib/media_library.c +lib/media_list.c +lib/media_list_path.h +lib/media_list_player.c +lib/media_player.c +lib/playlist.c +lib/video.c +lib/vlm.c + # modules modules/3dnow/memcpy.c modules/access/alsa.c diff --git a/src/Makefile.am b/src/Makefile.am index c2401a3bb7..3210814858 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,16 +7,11 @@ SUBDIRS = . test NULL = EXTRA_DIST = \ - libvlc.pc.in \ vlc-plugin.pc.in \ - libvlc.sym \ libvlccore.sym \ - revision.txt \ - ../include/vlc/libvlc_version.h.in + revision.txt -BUILT_SOURCES = \ - $(nodist_pkginclude_HEADERS) \ - $(nodist_pluginsinclude_HEADERS) +BUILT_SOURCES = $(nodist_pluginsinclude_HEADERS) CLEANFILES = $(BUILT_SOURCES) SUFFIXES = .pc.in .pc .rc.in .rc @@ -27,22 +22,6 @@ SUFFIXES = .pc.in .pc .rc.in .rc pluginsincludedir = $(pkgincludedir)/plugins -pkginclude_HEADERS = \ - ../include/vlc/vlc.h \ - ../include/vlc/deprecated.h \ - ../include/vlc/libvlc.h \ - ../include/vlc/libvlc_events.h \ - ../include/vlc/libvlc_media.h \ - ../include/vlc/libvlc_media_discoverer.h \ - ../include/vlc/libvlc_media_library.h \ - ../include/vlc/libvlc_media_list.h \ - ../include/vlc/libvlc_media_list_player.h \ - ../include/vlc/libvlc_media_player.h \ - ../include/vlc/libvlc_structures.h \ - ../include/vlc/libvlc_vlm.h \ - $(NULL) -nodist_pkginclude_HEADERS = ../include/vlc/libvlc_version.h - pluginsinclude_HEADERS = \ ../include/vlc_access.h \ ../include/vlc_acl.h \ @@ -138,10 +117,6 @@ noinst_HEADERS = \ ../include/vlc_windows_interfaces.h \ $(NULL) -../include/vlc/libvlc_version.h: ../include/vlc/libvlc_version.h.in $(top_builddir)/config.status - $(AM_V_GEN)cd "$(top_builddir)" && \ - $(SHELL) ./config.status --file="src/$@" - ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS $(AM_V_at)rm -f -- "$@.tmp" $(AM_V_at)mkdir -p -- ../include @@ -164,7 +139,7 @@ noinst_HEADERS = \ ############################################################################### pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libvlc.pc vlc-plugin.pc +pkgconfig_DATA = vlc-plugin.pc CLEANFILES += $(pkgconfig_DATA) .pc.in.pc: $(top_builddir)/config.status @@ -188,25 +163,20 @@ EXTRA_DIST += libvlc_win32_rc.rc.in # Building libvlc ############################################################################### -lib_LTLIBRARIES = libvlccore.la libvlc.la - -AM_LDFLAGS = -no-undefined -if HAVE_WIN32 -AM_LDFLAGS += -avoid-version -endif -if HAVE_WINCE -AM_LDFLAGS += -avoid-version -endif +lib_LTLIBRARIES = libvlccore.la -libvlccore_la_SOURCES = $(SOURCES_libvlc) -libvlccore_la_CPPFLAGS = $(INCICONV) \ +AM_CPPFLAGS = $(INCICONV) \ -DMODULE_STRING=\"main\" \ -DLOCALEDIR=\"$(localedir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DDATA_PATH=\"$(vlcdatadir)\" \ -DPKGLIBDIR=\"$(vlclibdir)\" -libvlccore_la_CFLAGS = $(CFLAGS_libvlccore) -libvlccore_la_LDFLAGS = $(LDFLAGS_libvlccore) $(AM_LDFLAGS) \ +AM_CFLAGS = $(CFLAGS_libvlccore) + +libvlccore_la_SOURCES = $(SOURCES_libvlc) +libvlccore_la_LDFLAGS = \ + -no-undefined \ + $(LDFLAGS_libvlccore) \ -no-undefined \ -export-symbols $(srcdir)/libvlccore.sym \ -version-info 5:0:0 @@ -217,27 +187,12 @@ libvlccore_la_LIBADD = $(LIBS_libvlccore) \ libvlccore_la_DEPENDENCIES = libvlccore.sym if HAVE_WIN32 libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT) -libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) +libvlccore_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -avoid-version endif libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc $(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@ -libvlc_la_SOURCES = $(SOURCES_libvlc_control) -libvlc_la_LIBADD = $(LIBS_libvlc) \ - libvlccore.la ../compat/libcompat.la -libvlc_la_CPPFLAGS = -DMODULE_STRING=\"libvlc\" -libvlc_la_CFLAGS = $(CFLAGS_libvlc) -libvlc_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_libvlc) \ - -version-info 6:0:1 \ - -export-symbols $(srcdir)/libvlc.sym -libvlc_la_DEPENDENCIES = libvlc.sym libvlccore.la -if HAVE_WIN32 -libvlc_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT) -libvlc_la_LDFLAGS += -Wl,libvlc_win32_rc.$(OBJEXT) -endif - - EXTRA_libvlccore_la_SOURCES = \ $(SOURCES_libvlc_darwin) \ $(SOURCES_libvlc_linux) \ @@ -511,30 +466,6 @@ SOURCES_libvlc = \ $(SOURCES_libvlc_common) \ $(NULL) -SOURCES_libvlc_control = \ - revision.c \ - control/libvlc_internal.h \ - control/event_internal.h \ - control/media_internal.h \ - control/media_list_internal.h \ - control/media_player_internal.h \ - control/core.c \ - control/error.c \ - control/log.c \ - control/playlist.c \ - control/vlm.c \ - control/video.c \ - control/audio.c \ - control/event.c \ - control/event_async.c \ - control/media.c \ - control/media_player.c \ - control/media_list.c \ - control/media_list_path.h \ - control/media_list_player.c \ - control/media_library.c \ - control/media_discoverer.c - ############################################################################### # libvlc pulse ############################################################################### @@ -593,7 +524,6 @@ check-local: exit 1; \ fi ; \ done - $(srcdir)/check_headers $(pkginclude_HEADERS) $(srcdir)/check_headers $(pluginsinclude_HEADERS) FORCE: diff --git a/src/interface/interface.c b/src/interface/interface.c index 0b3794f7b3..51191e15a5 100644 --- a/src/interface/interface.c +++ b/src/interface/interface.c @@ -41,10 +41,6 @@ #include #include #include - -#if defined( __APPLE__ ) || defined( WIN32 ) -#include "../control/libvlc_internal.h" -#endif #include "libvlc.h" /***************************************************************************** diff --git a/src/libvlc.c b/src/libvlc.c index 2740ae0437..b8e02bb9cc 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -37,7 +37,7 @@ #endif #include -#include "control/libvlc_internal.h" +#include "../lib/libvlc_internal.h" #include #include "modules/modules.h" diff --git a/src/misc/exit.c b/src/misc/exit.c index 65c380973a..504e491150 100644 --- a/src/misc/exit.c +++ b/src/misc/exit.c @@ -25,7 +25,7 @@ #include #include #include "libvlc.h" -#include "control/libvlc_internal.h" +#include "../lib/libvlc_internal.h" void vlc_ExitInit( vlc_exit_t *exit ) { diff --git a/test/libvlc/media_list_player.c b/test/libvlc/media_list_player.c index af46b5e4cc..ab9af3bd6c 100644 --- a/test/libvlc/media_list_player.c +++ b/test/libvlc/media_list_player.c @@ -34,7 +34,7 @@ This allows for the direct addition of subitems in the playback options test. This would not be necessary if there were an add subitems function. */ -#include "../../src/control/media_internal.h" +#include "../../lib/media_internal.h" struct check_items_order_data { bool done_playing; diff --git a/test/src/misc/variables.c b/test/src/misc/variables.c index 15e7fc5d0d..e710e1ed6f 100644 --- a/test/src/misc/variables.c +++ b/test/src/misc/variables.c @@ -24,7 +24,7 @@ #include #include "../../libvlc/test.h" -#include <../src/control/libvlc_internal.h> +#include "../lib/libvlc_internal.h" const char *psz_var_name[] = { "a", "abcdef", "abcdefg", "abc123", "abc-123", "é€!!" }; const int i_var_count = 6;