lua: remove recursion

diff --git a/configure.ac b/configure.ac
index ba4d8e8710d915a19a8ff53406bd39ff5be54742..08e04f44f7c4ed7c854e356ef126672c75b8973f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4196,7 +4196,6 @@ AC_CONFIG_FILES([
   modules/gui/macosx_dialog_provider/Makefile
   modules/gui/qt4/Makefile
   modules/gui/skins2/Makefile
-  modules/lua/Makefile
   modules/misc/Makefile
   modules/mux/Makefile
   modules/notify/Makefile

diff --git a/modules/Makefile.am b/modules/Makefile.am
index c90b20da4d10734e41e6461ffceed19b99809373..98faadd32c521a42f43a8b8ed6267341da8f5f08 100644 (file)
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -20,8 +20,7 @@ EXTRA_SUBDIRS = \
        access_output \
        mux \
        stream_out \
-       hw/vdpau \
-       lua
+       hw/vdpau
 
 SUBDIRS = . $(BASE_SUBDIRS)
 DIST_SUBDIRS = . $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
@@ -31,9 +30,6 @@ endif
 if HAVE_VDPAU
 SUBDIRS += hw/vdpau
 endif
-if BUILD_LUA
-SUBDIRS += lua
-endif
 
 dist_noinst_SCRIPTS = genmf list.sh module.rc.in
 dist_noinst_DATA = MODULES_LIST
@@ -45,6 +41,7 @@ include audio_mixer/Makefile.am
 include audio_output/Makefile.am
 include codec/Makefile.am
 include demux/Makefile.am
+include lua/Makefile.am
 include meta_engine/Makefile.am
 include services_discovery/Makefile.am
 

diff --git a/modules/lua/Makefile.am b/modules/lua/Makefile.am
index 9f83626a918f00855dbaa079a60ebf873e9ec4e3..673fc6998be60ecb7e43261e821d9c9bc7a33b42 100644 (file)
--- a/modules/lua/Makefile.am
+++ b/modules/lua/Makefile.am
@@ -1,41 +1,39 @@
-include ../common.am
-
 luadir = $(pluginsdir)/lua
 
 liblua_plugin_la_SOURCES = \
-       extension.c extension.h \
-       extension_thread.c \
-       intf.c \
-       meta.c \
-       demux.c \
-       services_discovery.c \
-       vlc.c vlc.h \
-       libs.h \
-       libs/configuration.c \
-       libs/equalizer.c \
-       libs/gettext.c \
-       libs/dialog.c \
-       libs/httpd.c \
-       libs/input.c libs/input.h \
-       libs/messages.c \
-       libs/misc.c libs/misc.h \
-       libs/net.c \
-       libs/objects.c libs/objects.h \
-       libs/osd.c \
-       libs/playlist.c libs/playlist.h \
-       libs/sd.c \
-       libs/stream.c \
-       libs/strings.c \
-       libs/variables.c libs/variables.h \
-       libs/video.c \
-       libs/vlm.c \
-       libs/volume.c \
-       libs/xml.c
+       lua/extension.c lua/extension.h \
+       lua/extension_thread.c \
+       lua/intf.c \
+       lua/meta.c \
+       lua/demux.c \
+       lua/services_discovery.c \
+       lua/vlc.c lua/vlc.h \
+       lua/libs.h \
+       lua/libs/configuration.c \
+       lua/libs/equalizer.c \
+       lua/libs/gettext.c \
+       lua/libs/dialog.c \
+       lua/libs/httpd.c \
+       lua/libs/input.c lua/libs/input.h \
+       lua/libs/messages.c \
+       lua/libs/misc.c lua/libs/misc.h \
+       lua/libs/net.c \
+       lua/libs/objects.c lua/libs/objects.h \
+       lua/libs/osd.c \
+       lua/libs/playlist.c lua/libs/playlist.h \
+       lua/libs/sd.c \
+       lua/libs/stream.c \
+       lua/libs/strings.c \
+       lua/libs/variables.c lua/libs/variables.h \
+       lua/libs/video.c \
+       lua/libs/vlm.c \
+       lua/libs/volume.c \
+       lua/libs/xml.c
 if HAVE_WIN32
-liblua_plugin_la_SOURCES += libs/win.c
+liblua_plugin_la_SOURCES += lua/libs/win.c
 endif
-liblua_plugin_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS)
+liblua_plugin_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS) -I$(srcdir)/lua
 liblua_plugin_la_LIBADD = $(LUA_LIBS) $(SOCKET_LIBS) $(LIBDL) $(LIBM) $(LIBPTHREAD)
-#if BUILD_LUA
+if BUILD_LUA
 lua_LTLIBRARIES = liblua_plugin.la
-#endif
+endif