vlc | branch: master | Alexandre Janniaux <aja...@videolabs.io> | Sat Mar 13 18:07:54 2021 +0100| [1fdebc28dc83a55c5d3d0f6048bec6c7e37a8130] | committer: Alexandre Janniaux
mmal: Makefile.am: use convenience library for mmal The convenience library factors the mmal libs and the object between the different plugins. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1fdebc28dc83a55c5d3d0f6048bec6c7e37a8130 --- modules/hw/mmal/Makefile.am | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/modules/hw/mmal/Makefile.am b/modules/hw/mmal/Makefile.am index 3d899645dd..0815e37870 100644 --- a/modules/hw/mmal/Makefile.am +++ b/modules/hw/mmal/Makefile.am @@ -1,31 +1,33 @@ include $(top_srcdir)/modules/common.am mmaldir = $(pluginsdir)/mmal -libmmal_vout_plugin_la_SOURCES = vout.c subpic.c subpic.h mmal_picture.c mmal_picture.h \ - mmal_cma.c mmal_cma.h +libvlc_mmal_la_SOURCES = subpic.c subpic.h mmal_picture.c mmal_picture.h \ + mmal_cma.c 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_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS) -libmmal_vout_plugin_la_LIBADD = $(MMAL_LIBS) $(LIBM) +libmmal_vout_plugin_la_LIBADD = $(LIBM) libvlc_mmal.la -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_SOURCES = codec.c libmmal_codec_plugin_la_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS) -libmmal_codec_plugin_la_LIBADD = $(MMAL_LIBS) +libmmal_codec_plugin_la_LIBADD = libvlc_mmal.la -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_SOURCES = converter.c libmmal_converter_plugin_la_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS) -libmmal_converter_plugin_la_LIBADD = $(MMAL_LIBS) +libmmal_converter_plugin_la_LIBADD = libvlc_mmal.la -libmmal_deinterlace_plugin_la_SOURCES = deinterlace.c mmal_picture.c mmal_picture.h \ - mmal_cma.c mmal_cma.h +libmmal_deinterlace_plugin_la_SOURCES = deinterlace.c libmmal_deinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS) -libmmal_deinterlace_plugin_la_LIBADD = $(MMAL_LIBS) +libmmal_deinterlace_plugin_la_LIBADD = libvlc_mmal.la -libmmal_device_plugin_la_SOURCES = decoder_device.c mmal_picture.h +libmmal_device_plugin_la_SOURCES = decoder_device.c libmmal_device_plugin_la_CFLAGS = $(AM_CFLAGS) $(MMAL_CFLAGS) -libmmal_device_plugin_la_LIBADD = $(MMAL_LIBS) +libmmal_device_plugin_la_LIBADD = libvlc_mmal.la if HAVE_MMAL +noinst_LTLIBRARIES += libvlc_mmal.la mmal_LTLIBRARIES = \ libmmal_device_plugin.la \ libmmal_deinterlace_plugin.la \ _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits