[vlc-commits] lua: avoid genmf

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep 22 18:14:30 2013 +0300| [7117de515f73f4351c94560078fe764439ac537b] | committer: Rémi Denis-Courmont

lua: avoid genmf

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7117de515f73f4351c94560078fe764439ac537b
---

 configure.ac            |   10 +++-------
 modules/lua/.gitignore  |    1 -
 modules/lua/Makefile.am |   41 +++++++++++++++++++++++++++++++++++++++++
 modules/lua/Modules.am  |   43 -------------------------------------------
 4 files changed, 44 insertions(+), 51 deletions(-)

diff --git a/configure.ac b/configure.ac
index a9cb3f9..182d5c6 100644
--- a/configure.ac
+++ b/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])
diff --git a/modules/lua/.gitignore b/modules/lua/.gitignore
deleted file mode 100644
index 08a6d72..0000000
--- a/modules/lua/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.am
diff --git a/modules/lua/Makefile.am b/modules/lua/Makefile.am
new file mode 100644
index 0000000..006587b
--- /dev/null
+++ b/modules/lua/Makefile.am
@@ -0,0 +1,41 @@
+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
+if HAVE_WIN32
+liblua_plugin_la_SOURCES += libs/win.c
+endif
+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
diff --git a/modules/lua/Modules.am b/modules/lua/Modules.am
deleted file mode 100644
index 701f429..0000000
--- a/modules/lua/Modules.am
+++ /dev/null
@@ -1,43 +0,0 @@
-SOURCES_lua = \
-	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 \
-	$(NULL)
-
-if HAVE_WIN32
-SOURCES_lua += libs/win.c
-endif
-
-lua_LTLIBRARIES += liblua_plugin.la