[vlc-devel] [PATCH 2/7] mmal: Makefile.am: fix mmal plugin definition

[Alexandre Janniaux]

Use only the MMAL_CFLAGS/MMAL_LIBS instead of sharing the flags of a
non-existant plugin. In addition, LDFLAGS is for linker flags different
from the -l or -L ones, and -rpath only needs to be defined when using
conditional compilation from autoconf (LTLIB and VLC_ADD_PLUGIN) so the
MMAL_LIBS must go to LIBADD.

In prevision of the removal of the recursive Makefile.am, use the
MMAL_CFLAGS on every targets that needs them.
---
 modules/hw/mmal/Makefile.am | 42 +++++++++++++++++--------------------
 1 file changed, 19 insertions(+), 23 deletions(-)

diff --git a/modules/hw/mmal/Makefile.am b/modules/hw/mmal/Makefile.am
index 023adb774a..3d899645dd 100644
--- a/modules/hw/mmal/Makefile.am
+++ b/modules/hw/mmal/Makefile.am
@@ -1,39 +1,35 @@
 include $(top_srcdir)/modules/common.am
 mmaldir = $(pluginsdir)/mmal
 
-AM_CFLAGS += $(CFLAGS_mmal)
-AM_LDFLAGS += -rpath '$(mmaldir)' $(LDFLAGS_mmal)
-
 libmmal_vout_plugin_la_SOURCES = vout.c subpic.c subpic.h mmal_picture.c mmal_picture.h \
   mmal_cma.c mmal_cma.h
-libmmal_vout_plugin_la_CFLAGS = $(AM_CFLAGS)
-libmmal_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -lm
-libmmal_vout_plugin_la_LIBADD = $(LIBS_mmal)
-mmal_LTLIBRARIES = libmmal_vout_plugin.la
+libmmal_vout_plugin_la_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS)
+libmmal_vout_plugin_la_LIBADD = $(MMAL_LIBS) $(LIBM)
 
 libmmal_codec_plugin_la_SOURCES = codec.c subpic.c subpic.h mmal_picture.c mmal_picture.h \
   mmal_cma.c mmal_cma.h
-libmmal_codec_plugin_la_CFLAGS = $(AM_CFLAGS)
-libmmal_codec_plugin_la_LDFLAGS = $(AM_LDFLAGS)
-libmmal_codec_plugin_la_LIBADD = $(LIBS_mmal)
-mmal_LTLIBRARIES += libmmal_codec_plugin.la
+libmmal_codec_plugin_la_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS)
+libmmal_codec_plugin_la_LIBADD = $(MMAL_LIBS)
 
 libmmal_converter_plugin_la_SOURCES = converter.c subpic.c subpic.h mmal_picture.c mmal_picture.h \
   mmal_cma.c mmal_cma.h
-libmmal_converter_plugin_la_CFLAGS = $(AM_CFLAGS)
-libmmal_converter_plugin_la_LDFLAGS = $(AM_LDFLAGS)
-libmmal_converter_plugin_la_LIBADD = $(LIBS_mmal)
-mmal_LTLIBRARIES += libmmal_converter_plugin.la
+libmmal_converter_plugin_la_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS)
+libmmal_converter_plugin_la_LIBADD = $(MMAL_LIBS)
 
 libmmal_deinterlace_plugin_la_SOURCES = deinterlace.c mmal_picture.c mmal_picture.h \
   mmal_cma.c mmal_cma.h
-libmmal_deinterlace_plugin_la_CFLAGS = $(AM_CFLAGS)
-libmmal_deinterlace_plugin_la_LDFLAGS = $(AM_LDFLAGS)
-libmmal_deinterlace_plugin_la_LIBADD = $(LIBS_mmal)
-mmal_LTLIBRARIES += libmmal_deinterlace_plugin.la
+libmmal_deinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS)
+libmmal_deinterlace_plugin_la_LIBADD = $(MMAL_LIBS)
 
 libmmal_device_plugin_la_SOURCES = decoder_device.c mmal_picture.h
-libmmal_device_plugin_la_CFLAGS = $(AM_CFLAGS)
-libmmal_device_plugin_la_LDFLAGS = $(AM_LDFLAGS)
-libmmal_device_plugin_la_LIBADD = $(LIBS_mmal)
-mmal_LTLIBRARIES += libmmal_device_plugin.la
+libmmal_device_plugin_la_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS)
+libmmal_device_plugin_la_LIBADD = $(MMAL_LIBS)
+
+if HAVE_MMAL
+mmal_LTLIBRARIES = \
+	libmmal_device_plugin.la \
+	libmmal_deinterlace_plugin.la \
+	libmmal_converter_plugin.la \
+	libmmal_codec_plugin.la \
+	libmmal_vout_plugin.la
+endif
-- 
2.30.2