lua: avoid genmf

configure.ac

@@ -602,7 +602,7 @@ AC_CHECK_FUNCS([if_nameindex if_nametoindex])
 VLC_RESTORE_FLAGS
 
 AS_IF([test -n "$SOCKET_LIBS"], [
-  VLC_ADD_LIBS([access_rtmp access_output_shout sap stream_out_standard stream_out_rtp stream_out_raop vod_rtsp rtp oldrc netsync gnutls ts audioscrobbler lua remoteosd audiobargraph_a],[${SOCKET_LIBS}])
+  VLC_ADD_LIBS([access_rtmp access_output_shout sap stream_out_standard stream_out_rtp stream_out_raop vod_rtsp rtp oldrc netsync gnutls ts audioscrobbler remoteosd audiobargraph_a],[${SOCKET_LIBS}])
 ])
 AC_SUBST(SOCKET_LIBS)
 
@@ -651,7 +651,7 @@ AC_CHECK_FUNC(getopt_long,, [
 AC_SUBST(GNUGETOPT_LIBS)
 
 AC_CHECK_LIB(m,cos,[
-  VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom noise grain scene lua chorus_flanger freetype swscale postproc equalizer spatializer param_eq samplerate freetype mpc qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v mono colorthres extract ball hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum],[-lm])
+  VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom noise grain scene chorus_flanger freetype swscale postproc equalizer spatializer param_eq samplerate freetype mpc qt4 compressor headphone_channel_mixer normvol audiobargraph_a audiobargraph_v mono colorthres extract ball hotkeys mosaic gaussianblur x262 x26410b hqdn3d anaglyph oldrc ncurses oldmovie glspectrum],[-lm])
   LIBM="-lm"
 ], [
   LIBM=""
@@ -687,7 +687,6 @@ AS_IF([test "${enable_shared}" = "no"], [
 AM_CONDITIONAL(HAVE_DYNAMIC_PLUGINS, [test "${have_dynamic_objects}" != "no"])
 
 AC_SUBST(LIBDL)
-VLC_ADD_LIBS([lua],[$LIBDL])
 
 dnl Check for thread library
 LIBPTHREAD=""
@@ -1551,10 +1550,7 @@ then
         ])
       ])
     ])
-  if test "x${have_lua}" = "xyes" ;  then
-     VLC_ADD_LIBS([lua],[$LUA_LIBS])
-     VLC_ADD_CFLAGS([lua],[$LUA_CFLAGS])
-  else
+  if test "x${have_lua}" != "xyes" ;  then
       AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
   fi
   AC_ARG_VAR([LUAC], [LUA byte compiler])

modules/lua/.gitignore

-Makefile.am

modules/lua/Modules.am → modules/lua/Makefile.am

-SOURCES_lua = \
-	extension.c \
-	extension.h \
+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 \
+	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/input.c libs/input.h \
 	libs/messages.c \
-	libs/misc.c \
-	libs/misc.h \
+	libs/misc.c libs/misc.h \
 	libs/net.c \
-	libs/objects.c \
-	libs/objects.h \
+	libs/objects.c libs/objects.h \
 	libs/osd.c \
-	libs/playlist.c \
-	libs/playlist.h \
+	libs/playlist.c libs/playlist.h \
 	libs/sd.c \
 	libs/stream.c \
 	libs/strings.c \
-	libs/variables.c \
-	libs/variables.h \
+	libs/variables.c libs/variables.h \
 	libs/video.c \
 	libs/vlm.c \
 	libs/volume.c \
-	libs/xml.c \
-	$(NULL)
-
+	libs/xml.c
 if HAVE_WIN32
-SOURCES_lua += libs/win.c
+liblua_plugin_la_SOURCES += libs/win.c
 endif
-
-lua_LTLIBRARIES += liblua_plugin.la
+liblua_plugin_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS)
+liblua_plugin_la_LIBADD = $(LUA_LIBS) $(SOCKET_LIBS) $(LIBDL) $(LIBM)
+#if BUILD_LUA
+lua_LTLIBRARIES = liblua_plugin.la
+#endif