Commit 7dcac684 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Move src/control/ to lib/

parent 69ec0625
...@@ -7,10 +7,8 @@ ...@@ -7,10 +7,8 @@
# which have makefiles with distribution information. # which have makefiles with distribution information.
# - src (libvlc) is nedeed by modules # - src (libvlc) is nedeed by modules
# - libs/* are needed by modules # - libs/* are needed by modules
DIST_SUBDIRS = \ DIST_SUBDIRS = m4 compat doc po share src modules lib bin test
m4 compat doc po share src \ SUBDIRS = compat doc po share src lib
bin modules test
SUBDIRS = compat doc po share src
if BUILD_VLC if BUILD_VLC
SUBDIRS += bin SUBDIRS += bin
endif endif
...@@ -347,8 +345,11 @@ MAINTAINERCLEANFILES = ChangeLog ...@@ -347,8 +345,11 @@ MAINTAINERCLEANFILES = ChangeLog
libcompat: libcompat:
cd compat && $(MAKE) $(AM_MAKEFLAGS) cd compat && $(MAKE) $(AM_MAKEFLAGS)
libvlc: libcompat libvlccore: libcompat
cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la
libvlc: libvlccore
cd lib && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
core: libvlc vlc$(EXEEXT) core: libvlc vlc$(EXEEXT)
cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT) cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT)
......
...@@ -31,7 +31,6 @@ endif ...@@ -31,7 +31,6 @@ endif
vlc_wrapper_SOURCES = rootwrap.c vlc_wrapper_SOURCES = rootwrap.c
vlc_wrapper_LDADD = $(SOCKET_LIBS) vlc_wrapper_LDADD = $(SOCKET_LIBS)
vlc_DEPENDENCIES = ../src/libvlc.sym
vlc_LDFLAGS = $(LDFLAGS_vlc) vlc_LDFLAGS = $(LDFLAGS_vlc)
vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la $(LIBS_vlc) vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la $(LIBS_vlc)
...@@ -46,7 +45,7 @@ vlc_static_LDFLAGS = $(vlc_LDFLAGS) ...@@ -46,7 +45,7 @@ vlc_static_LDFLAGS = $(vlc_LDFLAGS)
if HAVE_WIN32 if HAVE_WIN32
vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT) vlc_LDADD += -lwininet vlc_win32_rc.$(OBJEXT)
vlc_DEPENDENCIES += vlc_win32_rc.$(OBJEXT) vlc_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
else else
vlc_LDADD += $(LIBDL) vlc_LDADD += $(LIBDL)
vlc_static_LDFLAGS += -no-install -static vlc_static_LDFLAGS += -no-install -static
......
...@@ -4266,6 +4266,7 @@ AC_CONFIG_FILES([ ...@@ -4266,6 +4266,7 @@ AC_CONFIG_FILES([
compat/Makefile compat/Makefile
src/Makefile src/Makefile
src/test/Makefile src/test/Makefile
lib/Makefile
bin/Makefile bin/Makefile
test/Makefile test/Makefile
modules/access/Makefile modules/access/Makefile
......
...@@ -45,7 +45,7 @@ extern "C" { ...@@ -45,7 +45,7 @@ extern "C" {
enum libvlc_event_e { enum libvlc_event_e {
/* Append new event types at the end of a category. /* Append new event types at the end of a category.
* Do not remove, insert or re-order any entry. * 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_MediaMetaChanged=0,
libvlc_MediaSubItemAdded, libvlc_MediaSubItemAdded,
libvlc_MediaDurationChanged, libvlc_MediaDurationChanged,
......
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
#include <vlc_playlist.h> /* For the preparser */ #include <vlc_playlist.h> /* For the preparser */
#include <vlc_url.h> #include <vlc_url.h>
#include "libvlc.h" #include "../src/libvlc.h"
#include "libvlc_internal.h" #include "libvlc_internal.h"
#include "media_internal.h" #include "media_internal.h"
......
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
#include <vlc_vout.h> #include <vlc_vout.h>
#include <vlc_keys.h> #include <vlc_keys.h>
#include "libvlc.h"
#include "libvlc_internal.h" #include "libvlc_internal.h"
#include "media_internal.h" // libvlc_media_set_state() #include "media_internal.h" // libvlc_media_set_state()
#include "media_player_internal.h" #include "media_player_internal.h"
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#endif #endif
#include "libvlc_internal.h" #include "libvlc_internal.h"
#include "libvlc.h" #include "../src/libvlc.h"
#include <vlc/libvlc_structures.h> #include <vlc/libvlc_structures.h>
#include <vlc/libvlc.h> #include <vlc/libvlc.h>
......
...@@ -322,7 +322,7 @@ static bool active = false; ...@@ -322,7 +322,7 @@ static bool active = false;
#ifdef Q_WS_MAC #ifdef Q_WS_MAC
/* Used to abort the app.exec() on OSX after libvlc_Quit is called */ /* 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 ) static void Abort( void *obj )
{ {
QVLCApp::triggerQuit(); QVLCApp::triggerQuit();
......
...@@ -78,21 +78,6 @@ src/config/core.c ...@@ -78,21 +78,6 @@ src/config/core.c
src/config/file.c src/config/file.c
src/config/help.c src/config/help.c
src/config/intf.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/libc.c
src/extras/tdestroy.c src/extras/tdestroy.c
src/input/access.c src/input/access.c
...@@ -184,6 +169,22 @@ src/video_output/vout_internal.h ...@@ -184,6 +169,22 @@ src/video_output/vout_internal.h
src/video_output/vout_intf.c src/video_output/vout_intf.c
src/video_output/vout_subpictures.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
modules/3dnow/memcpy.c modules/3dnow/memcpy.c
modules/access/alsa.c modules/access/alsa.c
......
...@@ -7,16 +7,11 @@ SUBDIRS = . test ...@@ -7,16 +7,11 @@ SUBDIRS = . test
NULL = NULL =
EXTRA_DIST = \ EXTRA_DIST = \
libvlc.pc.in \
vlc-plugin.pc.in \ vlc-plugin.pc.in \
libvlc.sym \
libvlccore.sym \ libvlccore.sym \
revision.txt \ revision.txt
../include/vlc/libvlc_version.h.in
BUILT_SOURCES = \ BUILT_SOURCES = $(nodist_pluginsinclude_HEADERS)
$(nodist_pkginclude_HEADERS) \
$(nodist_pluginsinclude_HEADERS)
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
SUFFIXES = .pc.in .pc .rc.in .rc SUFFIXES = .pc.in .pc .rc.in .rc
...@@ -27,22 +22,6 @@ SUFFIXES = .pc.in .pc .rc.in .rc ...@@ -27,22 +22,6 @@ SUFFIXES = .pc.in .pc .rc.in .rc
pluginsincludedir = $(pkgincludedir)/plugins 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 = \ pluginsinclude_HEADERS = \
../include/vlc_access.h \ ../include/vlc_access.h \
../include/vlc_acl.h \ ../include/vlc_acl.h \
...@@ -138,10 +117,6 @@ noinst_HEADERS = \ ...@@ -138,10 +117,6 @@ noinst_HEADERS = \
../include/vlc_windows_interfaces.h \ ../include/vlc_windows_interfaces.h \
$(NULL) $(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 ../include/vlc_about.h: Makefile.am $(top_srcdir)/COPYING $(top_srcdir)/THANKS $(top_srcdir)/AUTHORS
$(AM_V_at)rm -f -- "$@.tmp" $(AM_V_at)rm -f -- "$@.tmp"
$(AM_V_at)mkdir -p -- ../include $(AM_V_at)mkdir -p -- ../include
...@@ -164,7 +139,7 @@ noinst_HEADERS = \ ...@@ -164,7 +139,7 @@ noinst_HEADERS = \
############################################################################### ###############################################################################
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libvlc.pc vlc-plugin.pc pkgconfig_DATA = vlc-plugin.pc
CLEANFILES += $(pkgconfig_DATA) CLEANFILES += $(pkgconfig_DATA)
.pc.in.pc: $(top_builddir)/config.status .pc.in.pc: $(top_builddir)/config.status
...@@ -188,25 +163,20 @@ EXTRA_DIST += libvlc_win32_rc.rc.in ...@@ -188,25 +163,20 @@ EXTRA_DIST += libvlc_win32_rc.rc.in
# Building libvlc # Building libvlc
############################################################################### ###############################################################################
lib_LTLIBRARIES = libvlccore.la libvlc.la lib_LTLIBRARIES = libvlccore.la
AM_LDFLAGS = -no-undefined
if HAVE_WIN32
AM_LDFLAGS += -avoid-version
endif
if HAVE_WINCE
AM_LDFLAGS += -avoid-version
endif
libvlccore_la_SOURCES = $(SOURCES_libvlc) AM_CPPFLAGS = $(INCICONV) \
libvlccore_la_CPPFLAGS = $(INCICONV) \
-DMODULE_STRING=\"main\" \ -DMODULE_STRING=\"main\" \
-DLOCALEDIR=\"$(localedir)\" \ -DLOCALEDIR=\"$(localedir)\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \
-DDATA_PATH=\"$(vlcdatadir)\" \ -DDATA_PATH=\"$(vlcdatadir)\" \
-DPKGLIBDIR=\"$(vlclibdir)\" -DPKGLIBDIR=\"$(vlclibdir)\"
libvlccore_la_CFLAGS = $(CFLAGS_libvlccore) AM_CFLAGS = $(CFLAGS_libvlccore)
libvlccore_la_LDFLAGS = $(LDFLAGS_libvlccore) $(AM_LDFLAGS) \
libvlccore_la_SOURCES = $(SOURCES_libvlc)
libvlccore_la_LDFLAGS = \
-no-undefined \
$(LDFLAGS_libvlccore) \
-no-undefined \ -no-undefined \
-export-symbols $(srcdir)/libvlccore.sym \ -export-symbols $(srcdir)/libvlccore.sym \
-version-info 5:0:0 -version-info 5:0:0
...@@ -217,27 +187,12 @@ libvlccore_la_LIBADD = $(LIBS_libvlccore) \ ...@@ -217,27 +187,12 @@ libvlccore_la_LIBADD = $(LIBS_libvlccore) \
libvlccore_la_DEPENDENCIES = libvlccore.sym libvlccore_la_DEPENDENCIES = libvlccore.sym
if HAVE_WIN32 if HAVE_WIN32
libvlccore_la_DEPENDENCIES += libvlc_win32_rc.$(OBJEXT) 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 endif
libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc libvlc_win32_rc.$(OBJEXT): libvlc_win32_rc.rc
$(WINDRES) --include-dir $(top_srcdir)/share -i $< -o $@ $(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 = \ EXTRA_libvlccore_la_SOURCES = \
$(SOURCES_libvlc_darwin) \ $(SOURCES_libvlc_darwin) \
$(SOURCES_libvlc_linux) \ $(SOURCES_libvlc_linux) \
...@@ -511,30 +466,6 @@ SOURCES_libvlc = \ ...@@ -511,30 +466,6 @@ SOURCES_libvlc = \
$(SOURCES_libvlc_common) \ $(SOURCES_libvlc_common) \
$(NULL) $(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 # libvlc pulse
############################################################################### ###############################################################################
...@@ -593,7 +524,6 @@ check-local: ...@@ -593,7 +524,6 @@ check-local:
exit 1; \ exit 1; \
fi ; \ fi ; \
done done
$(srcdir)/check_headers $(pkginclude_HEADERS)
$(srcdir)/check_headers $(pluginsinclude_HEADERS) $(srcdir)/check_headers $(pluginsinclude_HEADERS)
FORCE: FORCE:
......
...@@ -41,10 +41,6 @@ ...@@ -41,10 +41,6 @@
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_modules.h> #include <vlc_modules.h>
#include <vlc_interface.h> #include <vlc_interface.h>
#if defined( __APPLE__ ) || defined( WIN32 )
#include "../control/libvlc_internal.h"
#endif
#include "libvlc.h" #include "libvlc.h"
/***************************************************************************** /*****************************************************************************
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#endif #endif
#include <vlc_common.h> #include <vlc_common.h>
#include "control/libvlc_internal.h" #include "../lib/libvlc_internal.h"
#include <vlc_input.h> #include <vlc_input.h>
#include "modules/modules.h" #include "modules/modules.h"
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <vlc_common.h> #include <vlc_common.h>
#include <vlc_interface.h> #include <vlc_interface.h>
#include "libvlc.h" #include "libvlc.h"
#include "control/libvlc_internal.h" #include "../lib/libvlc_internal.h"
void vlc_ExitInit( vlc_exit_t *exit ) void vlc_ExitInit( vlc_exit_t *exit )
{ {
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
This allows for the direct addition of subitems in the playback options test. 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. 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 { struct check_items_order_data {
bool done_playing; bool done_playing;
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <limits.h> #include <limits.h>
#include "../../libvlc/test.h" #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 char *psz_var_name[] = { "a", "abcdef", "abcdefg", "abc123", "abc-123", "é€!!" };
const int i_var_count = 6; const int i_var_count = 6;
......
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