From 2eeecb47c846664e466677e9a592091e841290e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Sat, 14 Apr 2007 15:19:03 +0000
Subject: [PATCH] Move libvlc module stuff to their own subdirectory
---
po/POTFILES.in | 10 +++++-----
src/Makefile.am | 18 +++++++++---------
src/libvlc-common.c | 4 ++--
.../builtin.h.in} | 0
src/{misc => modules}/configuration.c | 0
src/{misc => modules}/configuration.h | 0
src/{misc => modules}/configuration_chain.c | 0
src/{misc => modules}/modules.c | 12 +++---------
src/{misc => modules}/modules.h | 0
src/playlist/loadsave.c | 2 +-
toolbox | 6 +++---
11 files changed, 23 insertions(+), 29 deletions(-)
rename src/{misc/modules_builtin.h.in => modules/builtin.h.in} (100%)
rename src/{misc => modules}/configuration.c (100%)
rename src/{misc => modules}/configuration.h (100%)
rename src/{misc => modules}/configuration_chain.c (100%)
rename src/{misc => modules}/modules.c (99%)
rename src/{misc => modules}/modules.h (100%)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2016634534eb..882b9538a468 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -111,9 +111,9 @@ src/libvlc.c
src/libvlc.h
src/misc/beos_specific.cpp
src/misc/block.c
-src/misc/configuration.c
-src/misc/configuration.h
-src/misc/configuration_chain.c
+src/modules/configuration.c
+src/modules/configuration.h
+src/modules/configuration_chain.c
src/misc/cpu.c
src/misc/darwin_specific.c
src/misc/devices.c
@@ -121,8 +121,8 @@ src/misc/error.c
src/misc/image.c
src/misc/md5.c
src/misc/messages.c
-src/misc/modules.c
-src/misc/modules.h
+src/modules/modules.c
+src/modules/modules.h
src/misc/mtime.c
src/misc/objects.c
src/misc/stats.c
diff --git a/src/Makefile.am b/src/Makefile.am
index d1c17f01d55d..1974c680a077 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,10 +7,10 @@ AUTOMAKE_OPTIONS = subdir-objects
NULL =
SUBDIRS =
-EXTRA_DIST = extras/COPYING misc/modules_builtin.h.in libvlc.sym
+EXTRA_DIST = extras/COPYING modules/builtin.h.in libvlc.sym
BUILT_SOURCES = $(CLEANFILES)
-CLEANFILES = misc/modules_builtin.h
+CLEANFILES = modules/builtin.h
MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
TOOLBOX = srcdir=$(top_srcdir) builddir=$(top_builddir) $(top_srcdir)/toolbox
@@ -90,11 +90,11 @@ HEADERS_include = \
../include/vlc_vout_synchro.h \
$(NULL)
-misc/modules_builtin.h: misc/modules_builtin.h.in
+modules/builtin.h: modules/builtin.h.in
$(TOOLBOX) --update-includes
touch $@
-misc/modules.c: misc/modules_builtin.h
+modules/modules.c: modules/builtin.h
###############################################################################
# Building libvlc
@@ -286,14 +286,14 @@ SOURCES_libvlc_common = \
misc/md5.c \
misc/mtime.c \
misc/block.c \
- misc/modules.h \
- misc/modules.c \
+ modules/modules.h \
+ modules/modules.c \
misc/threads.c \
misc/stats.c \
misc/cpu.c \
- misc/configuration.h \
- misc/configuration.c \
- misc/configuration_chain.c \
+ modules/configuration.h \
+ modules/configuration.c \
+ modules/configuration_chain.c \
misc/image.c \
misc/messages.c \
misc/objects.c \
diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 79a0c5a5c888..2c03b2ccaf42 100644
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -36,8 +36,8 @@
#include "control/libvlc_internal.h"
#include <vlc_input.h>
-#include "misc/modules.h"
-#include "misc/configuration.h"
+#include "modules/modules.h"
+#include "modules/configuration.h"
#include <errno.h> /* ENOMEM */
#include <stdio.h> /* sprintf() */
diff --git a/src/misc/modules_builtin.h.in b/src/modules/builtin.h.in
similarity index 100%
rename from src/misc/modules_builtin.h.in
rename to src/modules/builtin.h.in
diff --git a/src/misc/configuration.c b/src/modules/configuration.c
similarity index 100%
rename from src/misc/configuration.c
rename to src/modules/configuration.c
diff --git a/src/misc/configuration.h b/src/modules/configuration.h
similarity index 100%
rename from src/misc/configuration.h
rename to src/modules/configuration.h
diff --git a/src/misc/configuration_chain.c b/src/modules/configuration_chain.c
similarity index 100%
rename from src/misc/configuration_chain.c
rename to src/modules/configuration_chain.c
diff --git a/src/misc/modules.c b/src/modules/modules.c
similarity index 99%
rename from src/misc/modules.c
rename to src/modules/modules.c
index 8abbac123166..4fcf249e84e0 100644
--- a/src/misc/modules.c
+++ b/src/modules/modules.c
@@ -75,7 +75,7 @@
# endif
#endif
-#include "misc/configuration.h"
+#include "modules/configuration.h"
#include "vlc_interface.h"
#include "vlc_playlist.h"
@@ -111,15 +111,9 @@
#include "vlc_strings.h"
#include "vlc_streaming.h"
-#include "modules.h"
+#include "modules/modules.h"
+#include "modules/builtin.h"
-#if defined( _MSC_VER ) && defined( UNDER_CE )
-# include "modules_builtin_evc.h"
-#elif defined( _MSC_VER )
-# include "modules_builtin_msvc.h"
-#else
-# include "modules_builtin.h"
-#endif
#include "vlc_network.h"
#if defined( WIN32 ) || defined( UNDER_CE )
diff --git a/src/misc/modules.h b/src/modules/modules.h
similarity index 100%
rename from src/misc/modules.h
rename to src/modules/modules.h
diff --git a/src/playlist/loadsave.c b/src/playlist/loadsave.c
index 8097d09589b7..c914a306e05d 100644
--- a/src/playlist/loadsave.c
+++ b/src/playlist/loadsave.c
@@ -23,7 +23,7 @@
#include <vlc/vlc.h>
#include <vlc_playlist.h>
#include "playlist_internal.h"
-#include "misc/configuration.h"
+#include "modules/configuration.h"
#include <vlc_charset.h>
#include <errno.h>
diff --git a/toolbox b/toolbox
index 15260fe5e440..088181c71bf9 100755
--- a/toolbox
+++ b/toolbox
@@ -547,11 +547,11 @@ then
fi
BUILTINS=`sed -ne 's/.*builtins *= *" *\([^"]*\)".*/\1/p' ${builddir}/vlc-config`
- file="${builddir}/src/misc/modules_builtin.h"
+ file="${builddir}/src/modules/builtin.h"
rm -f "${file}.tmp"
- mkdir -p -- "${builddir}/src/misc"
- cat "${srcdir}/src/misc/modules_builtin.h.in" > "${file}.tmp" || exit 1
+ mkdir -p -- "${builddir}/src/modules"
+ cat "${srcdir}/src/modules/builtin.h.in" > "${file}.tmp" || exit 1
if test -n "${BUILTINS}"
then
for i in `echo ${BUILTINS}`
--
GitLab