Move libvlc module stuff to their own subdirectory

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

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 \

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() */

src/misc/modules.c → 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 )

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>

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}`