Commit 61147a76 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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

Lua is an important part of VLC and abusing misc has gone a bit too far...
parent 7295684e
...@@ -4388,10 +4388,10 @@ AC_CONFIG_FILES([ ...@@ -4388,10 +4388,10 @@ AC_CONFIG_FILES([
modules/gui/macosx_dialog_provider/Makefile modules/gui/macosx_dialog_provider/Makefile
modules/gui/qt4/Makefile modules/gui/qt4/Makefile
modules/gui/skins2/Makefile modules/gui/skins2/Makefile
modules/lua/Makefile
modules/meta_engine/Makefile modules/meta_engine/Makefile
modules/misc/Makefile modules/misc/Makefile
modules/misc/dummy/Makefile modules/misc/dummy/Makefile
modules/misc/lua/Makefile
modules/misc/notify/Makefile modules/misc/notify/Makefile
modules/misc/playlist/Makefile modules/misc/playlist/Makefile
modules/misc/osd/Makefile modules/misc/osd/Makefile
......
...@@ -28,6 +28,7 @@ EXTRA_SUBDIRS = \ ...@@ -28,6 +28,7 @@ EXTRA_SUBDIRS = \
3dnow \ 3dnow \
altivec \ altivec \
arm_neon \ arm_neon \
lua \
$(NULL) $(NULL)
SUBDIRS = $(BASE_SUBDIRS) SUBDIRS = $(BASE_SUBDIRS)
...@@ -53,6 +54,9 @@ endif ...@@ -53,6 +54,9 @@ endif
if HAVE_ARM_NEON if HAVE_ARM_NEON
SUBDIRS += arm_neon SUBDIRS += arm_neon
endif endif
if BUILD_LUA
SUBDIRS += lua
endif
SUBDIRS += . SUBDIRS += .
dist_noinst_SCRIPTS = genmf list.sh dist_noinst_SCRIPTS = genmf list.sh
......
BASE_SUBDIRS = dummy notify playlist stats osd BASE_SUBDIRS = dummy notify playlist stats osd
EXTRA_SUBDIRS = lua
SUBDIRS = $(BASE_SUBDIRS) SUBDIRS = $(BASE_SUBDIRS)
DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) DIST_SUBDIRS = $(BASE_SUBDIRS)
if BUILD_LUA
SUBDIRS += lua
endif
SOURCES_freetype = freetype.c text_renderer.h SOURCES_freetype = freetype.c text_renderer.h
SOURCES_win32text = win32text.c SOURCES_win32text = win32text.c
......
...@@ -894,6 +894,34 @@ modules/gui/skins2/x11/x11_tooltip.cpp ...@@ -894,6 +894,34 @@ modules/gui/skins2/x11/x11_tooltip.cpp
modules/gui/skins2/x11/x11_tooltip.hpp modules/gui/skins2/x11/x11_tooltip.hpp
modules/gui/skins2/x11/x11_window.cpp modules/gui/skins2/x11/x11_window.cpp
modules/gui/skins2/x11/x11_window.hpp 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/folder.c
modules/meta_engine/taglib.cpp modules/meta_engine/taglib.cpp
modules/misc/audioscrobbler.c modules/misc/audioscrobbler.c
...@@ -914,34 +942,6 @@ modules/misc/inhibit/osso.c ...@@ -914,34 +942,6 @@ modules/misc/inhibit/osso.c
modules/misc/inhibit/xdg.c modules/misc/inhibit/xdg.c
modules/misc/inhibit/xscreensaver.c modules/misc/inhibit/xscreensaver.c
modules/misc/logger.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.m
modules/misc/notify/growl_udp.c modules/misc/notify/growl_udp.c
modules/misc/notify/msn.c modules/misc/notify/msn.c
......
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