Move /modules/misc/lua/ to /modules/lua

Lua is an important part of VLC and abusing misc has gone a bit too far...

diff --git a/configure.ac b/configure.ac
index b9ce0b76110bc6205ec401896882bf650b6e98e8..09dc60331a29c6c0146cc9f82112b157a5730fb3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4388,10 +4388,10 @@ AC_CONFIG_FILES([
   modules/gui/macosx_dialog_provider/Makefile
   modules/gui/qt4/Makefile
   modules/gui/skins2/Makefile
+  modules/lua/Makefile
   modules/meta_engine/Makefile
   modules/misc/Makefile
   modules/misc/dummy/Makefile
-  modules/misc/lua/Makefile
   modules/misc/notify/Makefile
   modules/misc/playlist/Makefile
   modules/misc/osd/Makefile

diff --git a/modules/Makefile.am b/modules/Makefile.am
index ffba2ae4503bd267719d0c491fc5f456f757f265..530d0a199a752042884d1bce1bf1d2e5f5e75cec 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -28,6 +28,7 @@ EXTRA_SUBDIRS = \
        3dnow \
        altivec \
        arm_neon \
+       lua \
        $(NULL)
 
 SUBDIRS = $(BASE_SUBDIRS)
@@ -53,6 +54,9 @@ endif
 if HAVE_ARM_NEON
 SUBDIRS += arm_neon
 endif
+if BUILD_LUA
+SUBDIRS += lua
+endif
 SUBDIRS += .
 
 dist_noinst_SCRIPTS = genmf list.sh

diff --git a/modules/misc/lua/Modules.am b/modules/lua/Modules.am
similarity index 100%
rename from modules/misc/lua/Modules.am
rename to modules/lua/Modules.am

diff --git a/modules/misc/lua/demux.c b/modules/lua/demux.c
similarity index 100%
rename from modules/misc/lua/demux.c
rename to modules/lua/demux.c

diff --git a/modules/misc/lua/extension.c b/modules/lua/extension.c
similarity index 100%
rename from modules/misc/lua/extension.c
rename to modules/lua/extension.c

diff --git a/modules/misc/lua/extension.h b/modules/lua/extension.h
similarity index 100%
rename from modules/misc/lua/extension.h
rename to modules/lua/extension.h

diff --git a/modules/misc/lua/extension_thread.c b/modules/lua/extension_thread.c
similarity index 100%
rename from modules/misc/lua/extension_thread.c
rename to modules/lua/extension_thread.c

diff --git a/modules/misc/lua/intf.c b/modules/lua/intf.c
similarity index 100%
rename from modules/misc/lua/intf.c
rename to modules/lua/intf.c

diff --git a/modules/misc/lua/libs.h b/modules/lua/libs.h
similarity index 100%
rename from modules/misc/lua/libs.h
rename to modules/lua/libs.h

diff --git a/modules/misc/lua/libs/acl.c b/modules/lua/libs/acl.c
similarity index 100%
rename from modules/misc/lua/libs/acl.c
rename to modules/lua/libs/acl.c

diff --git a/modules/misc/lua/libs/configuration.c b/modules/lua/libs/configuration.c
similarity index 100%
rename from modules/misc/lua/libs/configuration.c
rename to modules/lua/libs/configuration.c

diff --git a/modules/misc/lua/libs/dialog.c b/modules/lua/libs/dialog.c
similarity index 100%
rename from modules/misc/lua/libs/dialog.c
rename to modules/lua/libs/dialog.c

diff --git a/modules/misc/lua/libs/gettext.c b/modules/lua/libs/gettext.c
similarity index 100%
rename from modules/misc/lua/libs/gettext.c
rename to modules/lua/libs/gettext.c

diff --git a/modules/misc/lua/libs/httpd.c b/modules/lua/libs/httpd.c
similarity index 100%
rename from modules/misc/lua/libs/httpd.c
rename to modules/lua/libs/httpd.c

diff --git a/modules/misc/lua/libs/input.c b/modules/lua/libs/input.c
similarity index 100%
rename from modules/misc/lua/libs/input.c
rename to modules/lua/libs/input.c

diff --git a/modules/misc/lua/libs/input.h b/modules/lua/libs/input.h
similarity index 100%
rename from modules/misc/lua/libs/input.h
rename to modules/lua/libs/input.h

diff --git a/modules/misc/lua/libs/md5.c b/modules/lua/libs/md5.c
similarity index 100%
rename from modules/misc/lua/libs/md5.c
rename to modules/lua/libs/md5.c

diff --git a/modules/misc/lua/libs/messages.c b/modules/lua/libs/messages.c
similarity index 100%
rename from modules/misc/lua/libs/messages.c
rename to modules/lua/libs/messages.c

diff --git a/modules/misc/lua/libs/misc.c b/modules/lua/libs/misc.c
similarity index 100%
rename from modules/misc/lua/libs/misc.c
rename to modules/lua/libs/misc.c

diff --git a/modules/misc/lua/libs/misc.h b/modules/lua/libs/misc.h
similarity index 100%
rename from modules/misc/lua/libs/misc.h
rename to modules/lua/libs/misc.h

diff --git a/modules/misc/lua/libs/net.c b/modules/lua/libs/net.c
similarity index 100%
rename from modules/misc/lua/libs/net.c
rename to modules/lua/libs/net.c

diff --git a/modules/misc/lua/libs/objects.c b/modules/lua/libs/objects.c
similarity index 100%
rename from modules/misc/lua/libs/objects.c
rename to modules/lua/libs/objects.c

diff --git a/modules/misc/lua/libs/objects.h b/modules/lua/libs/objects.h
similarity index 100%
rename from modules/misc/lua/libs/objects.h
rename to modules/lua/libs/objects.h

diff --git a/modules/misc/lua/libs/osd.c b/modules/lua/libs/osd.c
similarity index 100%
rename from modules/misc/lua/libs/osd.c
rename to modules/lua/libs/osd.c

diff --git a/modules/misc/lua/libs/playlist.c b/modules/lua/libs/playlist.c
similarity index 100%
rename from modules/misc/lua/libs/playlist.c
rename to modules/lua/libs/playlist.c

diff --git a/modules/misc/lua/libs/playlist.h b/modules/lua/libs/playlist.h
similarity index 100%
rename from modules/misc/lua/libs/playlist.h
rename to modules/lua/libs/playlist.h

diff --git a/modules/misc/lua/libs/sd.c b/modules/lua/libs/sd.c
similarity index 100%
rename from modules/misc/lua/libs/sd.c
rename to modules/lua/libs/sd.c

diff --git a/modules/misc/lua/libs/stream.c b/modules/lua/libs/stream.c
similarity index 100%
rename from modules/misc/lua/libs/stream.c
rename to modules/lua/libs/stream.c

diff --git a/modules/misc/lua/libs/strings.c b/modules/lua/libs/strings.c
similarity index 100%
rename from modules/misc/lua/libs/strings.c
rename to modules/lua/libs/strings.c

diff --git a/modules/misc/lua/libs/variables.c b/modules/lua/libs/variables.c
similarity index 100%
rename from modules/misc/lua/libs/variables.c
rename to modules/lua/libs/variables.c

diff --git a/modules/misc/lua/libs/variables.h b/modules/lua/libs/variables.h
similarity index 100%
rename from modules/misc/lua/libs/variables.h
rename to modules/lua/libs/variables.h

diff --git a/modules/misc/lua/libs/video.c b/modules/lua/libs/video.c
similarity index 100%
rename from modules/misc/lua/libs/video.c
rename to modules/lua/libs/video.c

diff --git a/modules/misc/lua/libs/vlm.c b/modules/lua/libs/vlm.c
similarity index 100%
rename from modules/misc/lua/libs/vlm.c
rename to modules/lua/libs/vlm.c

diff --git a/modules/misc/lua/libs/volume.c b/modules/lua/libs/volume.c
similarity index 100%
rename from modules/misc/lua/libs/volume.c
rename to modules/lua/libs/volume.c

diff --git a/modules/misc/lua/libs/xml.c b/modules/lua/libs/xml.c
similarity index 100%
rename from modules/misc/lua/libs/xml.c
rename to modules/lua/libs/xml.c

diff --git a/modules/misc/lua/meta.c b/modules/lua/meta.c
similarity index 100%
rename from modules/misc/lua/meta.c
rename to modules/lua/meta.c

diff --git a/modules/misc/lua/services_discovery.c b/modules/lua/services_discovery.c
similarity index 100%
rename from modules/misc/lua/services_discovery.c
rename to modules/lua/services_discovery.c

diff --git a/modules/misc/lua/vlc.c b/modules/lua/vlc.c
similarity index 100%
rename from modules/misc/lua/vlc.c
rename to modules/lua/vlc.c

diff --git a/modules/misc/lua/vlc.h b/modules/lua/vlc.h
similarity index 100%
rename from modules/misc/lua/vlc.h
rename to modules/lua/vlc.h

diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index 488a36aa9258db17a01c7ba04dc365fe76ed6eee..590f31146db7948cd2682be2da2b86746f60852f 100644 (file)
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -1,12 +1,7 @@
 BASE_SUBDIRS = dummy notify playlist stats osd
-EXTRA_SUBDIRS = lua
 
 SUBDIRS = $(BASE_SUBDIRS)
-DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
-
-if BUILD_LUA
-SUBDIRS += lua
-endif
+DIST_SUBDIRS = $(BASE_SUBDIRS)
 
 SOURCES_freetype = freetype.c text_renderer.h
 SOURCES_win32text = win32text.c

diff --git a/po/POTFILES.in b/po/POTFILES.in
index ef87aeea782e116910965768712e0bb7d301cdff..8708ab1e95e77d61cf7ecaf5f7a9cba68c89ec5a 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -894,6 +894,34 @@ modules/gui/skins2/x11/x11_tooltip.cpp
 modules/gui/skins2/x11/x11_tooltip.hpp
 modules/gui/skins2/x11/x11_window.cpp
 modules/gui/skins2/x11/x11_window.hpp
+modules/lua/demux.c
+modules/lua/intf.c
+modules/lua/libs.h
+modules/lua/libs/acl.c
+modules/lua/libs/configuration.c
+modules/lua/libs/httpd.c
+modules/lua/libs/input.c
+modules/lua/libs/input.h
+modules/lua/libs/messages.c
+modules/lua/libs/misc.c
+modules/lua/libs/misc.h
+modules/lua/libs/net.c
+modules/lua/libs/objects.c
+modules/lua/libs/objects.h
+modules/lua/libs/osd.c
+modules/lua/libs/playlist.c
+modules/lua/libs/playlist.h
+modules/lua/libs/sd.c
+modules/lua/libs/stream.c
+modules/lua/libs/strings.c
+modules/lua/libs/variables.c
+modules/lua/libs/variables.h
+modules/lua/libs/video.c
+modules/lua/libs/vlm.c
+modules/lua/libs/volume.c
+modules/lua/meta.c
+modules/lua/vlc.c
+modules/lua/vlc.h
 modules/meta_engine/folder.c
 modules/meta_engine/taglib.cpp
 modules/misc/audioscrobbler.c
@@ -914,34 +942,6 @@ modules/misc/inhibit/osso.c
 modules/misc/inhibit/xdg.c
 modules/misc/inhibit/xscreensaver.c
 modules/misc/logger.c
-modules/misc/lua/demux.c
-modules/misc/lua/intf.c
-modules/misc/lua/libs.h
-modules/misc/lua/libs/acl.c
-modules/misc/lua/libs/configuration.c
-modules/misc/lua/libs/httpd.c
-modules/misc/lua/libs/input.c
-modules/misc/lua/libs/input.h
-modules/misc/lua/libs/messages.c
-modules/misc/lua/libs/misc.c
-modules/misc/lua/libs/misc.h
-modules/misc/lua/libs/net.c
-modules/misc/lua/libs/objects.c
-modules/misc/lua/libs/objects.h
-modules/misc/lua/libs/osd.c
-modules/misc/lua/libs/playlist.c
-modules/misc/lua/libs/playlist.h
-modules/misc/lua/libs/sd.c
-modules/misc/lua/libs/stream.c
-modules/misc/lua/libs/strings.c
-modules/misc/lua/libs/variables.c
-modules/misc/lua/libs/variables.h
-modules/misc/lua/libs/video.c
-modules/misc/lua/libs/vlm.c
-modules/misc/lua/libs/volume.c
-modules/misc/lua/meta.c
-modules/misc/lua/vlc.c
-modules/misc/lua/vlc.h
 modules/misc/notify/growl.m
 modules/misc/notify/growl_udp.c
 modules/misc/notify/msn.c