[vlc-devel] [PATCH 5/7] Makefile.am: mmal: remove recursive Makefile target

[Alexandre Janniaux]

Sort of revert 1d2b56c68bbc3287e17f6140bdf8c8c3efe08fdc but it actually
finish the work done in ticket #9367 by removing the last recursive
makefile target in modules/.

It allows faster make (though not significant here) but most of all,
sharing the same variable definition scope in modules/ for all
makefiles.

In particular, this facilitate for future work implementing partial
linking at the module level, which actually needs the list of all
plugins being compiled.
---
 configure.ac                |  1 -
 modules/Makefile.am         |  8 +-------
 modules/hw/mmal/Makefile.am | 16 ++++++++--------
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index ce7e36f186..ea0bb759f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4645,7 +4645,6 @@ AC_CONFIG_FILES([
   lib/Makefile
   bin/Makefile
   test/Makefile
-  modules/hw/mmal/Makefile
   share/vlc.appdata.xml.in
 ])
 
diff --git a/modules/Makefile.am b/modules/Makefile.am
index e9f48422e0..a9b573ae8c 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -6,15 +6,8 @@ check_PROGRAMS =
 pkglibexec_PROGRAMS =
 EXTRA_DIST =
 
-EXTRA_SUBDIRS = \
-	hw/mmal
 
 SUBDIRS = .
-DIST_SUBDIRS = . $(EXTRA_SUBDIRS)
-if HAVE_MMAL
-SUBDIRS += hw/mmal
-endif
-
 TESTS =
 
 dist_noinst_SCRIPTS = module.rc.in
@@ -37,6 +30,7 @@ include hw/d3d9/Makefile.am
 include hw/d3d11/Makefile.am
 include hw/vaapi/Makefile.am
 include hw/vdpau/Makefile.am
+include hw/mmal/Makefile.am
 include keystore/Makefile.am
 include logger/Makefile.am
 include lua/Makefile.am
diff --git a/modules/hw/mmal/Makefile.am b/modules/hw/mmal/Makefile.am
index 0815e37870..6ac3735340 100644
--- a/modules/hw/mmal/Makefile.am
+++ b/modules/hw/mmal/Makefile.am
@@ -1,28 +1,28 @@
-include $(top_srcdir)/modules/common.am
 mmaldir = $(pluginsdir)/mmal
 
-libvlc_mmal_la_SOURCES = subpic.c subpic.h mmal_picture.c mmal_picture.h \
-	mmal_cma.c mmal_cma.h
+libvlc_mmal_la_SOURCES = hw/mmal/subpic.c hw/mmal/subpic.h \
+	hw/mmal/mmal_picture.c hw/mmal/mmal_picture.h \
+	hw/mmal/mmal_cma.c hw/mmal/mmal_cma.h
 libvlc_mmal_la_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS)
 libvlc_mmal_la_LIBADD = $(MMAL_LIBS)
 
-libmmal_vout_plugin_la_SOURCES = vout.c
+libmmal_vout_plugin_la_SOURCES = hw/mmal/vout.c
 libmmal_vout_plugin_la_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS)
 libmmal_vout_plugin_la_LIBADD = $(LIBM) libvlc_mmal.la
 
-libmmal_codec_plugin_la_SOURCES = codec.c
+libmmal_codec_plugin_la_SOURCES = hw/mmal/codec.c
 libmmal_codec_plugin_la_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS)
 libmmal_codec_plugin_la_LIBADD = libvlc_mmal.la
 
-libmmal_converter_plugin_la_SOURCES = converter.c
+libmmal_converter_plugin_la_SOURCES = hw/mmal/converter.c
 libmmal_converter_plugin_la_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS)
 libmmal_converter_plugin_la_LIBADD = libvlc_mmal.la
 
-libmmal_deinterlace_plugin_la_SOURCES = deinterlace.c
+libmmal_deinterlace_plugin_la_SOURCES = hw/mmal/deinterlace.c
 libmmal_deinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS)
 libmmal_deinterlace_plugin_la_LIBADD = libvlc_mmal.la
 
-libmmal_device_plugin_la_SOURCES = decoder_device.c
+libmmal_device_plugin_la_SOURCES = hw/mmal/decoder_device.c
 libmmal_device_plugin_la_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS)
 libmmal_device_plugin_la_LIBADD = libvlc_mmal.la
 
-- 
2.30.2