Makefile.am: add redirection level for plugins

modules/access/Makefile.am

@@ -1,14 +1,21 @@
 accessdir = $(pluginsdir)/access
+access_PLUGINS =
 access_LTLIBRARIES =
 access_RPATH =
+
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(access_PLUGINS)
+else
+access_LTLIBRARIES += $(access_PLUGINS)
 access_RPATH += -rpath '$(accessdir)'
+endif
 
 AM_CPPFLAGS += -I$(srcdir)/access
 
 ### Files ###
 
 libdata_plugin_la_SOURCES = access/data.c
-access_LTLIBRARIES += libdata_plugin.la
+access_PLUGINS += libdata_plugin.la
 
 libdcp_plugin_la_SOURCES = access/dcp/dcpparser.h access/dcp/dcp.cpp access/dcp/dcpparser.cpp access/dcp/dcpdecrypt.cpp
 if HAVE_ASDCP
@@ -17,37 +24,37 @@ libdcp_plugin_la_LIBADD = $(AM_LIBADD) $(ASDCP_LIBS)
 if HAVE_GCRYPT
 libdcp_plugin_la_CPPFLAGS += $(GCRYPT_CFLAGS)
 libdcp_plugin_la_LIBADD += $(GCRYPT_LIBS)
-access_LTLIBRARIES += libdcp_plugin.la
+access_PLUGINS += libdcp_plugin.la
 endif
 endif
 
 libfilesystem_plugin_la_SOURCES = access/fs.h access/file.c access/directory.c access/fs.c
 libfilesystem_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-access_LTLIBRARIES += libfilesystem_plugin.la
+access_PLUGINS += libfilesystem_plugin.la
 
 if HAVE_EMSCRIPTEN
 libemjsfile_plugin_la_SOURCES = access/emjsfile.c
-access_LTLIBRARIES += libemjsfile_plugin.la
+access_PLUGINS += libemjsfile_plugin.la
 endif
 
 libidummy_plugin_la_SOURCES = access/idummy.c
-access_LTLIBRARIES += libidummy_plugin.la
+access_PLUGINS += libidummy_plugin.la
 
 libimem_plugin_la_SOURCES = access/imem-access.c
 libimem_plugin_la_LIBADD = $(LIBM)
-access_LTLIBRARIES += libimem_plugin.la
+access_PLUGINS += libimem_plugin.la
 
 libaccess_imem_plugin_la_SOURCES = access/imem.c
-access_LTLIBRARIES += libaccess_imem_plugin.la
+access_PLUGINS += libaccess_imem_plugin.la
 
 libsdp_plugin_la_SOURCES = access/sdp.c
-access_LTLIBRARIES += libsdp_plugin.la
+access_PLUGINS += libsdp_plugin.la
 
 libtimecode_plugin_la_SOURCES = access/timecode.c
-access_LTLIBRARIES += libtimecode_plugin.la
+access_PLUGINS += libtimecode_plugin.la
 
 libvdr_plugin_la_SOURCES = access/vdr.c
-access_LTLIBRARIES += libvdr_plugin.la
+access_PLUGINS += libvdr_plugin.la
 
 ### Audio capture ###
 
@@ -55,41 +62,41 @@ libaccess_alsa_plugin_la_SOURCES = access/alsa.c
 libaccess_alsa_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
 libaccess_alsa_plugin_la_LIBADD = $(ALSA_LIBS)
 if HAVE_ALSA
-access_LTLIBRARIES += libaccess_alsa_plugin.la
+access_PLUGINS += libaccess_alsa_plugin.la
 endif
 
 libaccess_oss_plugin_la_SOURCES = access/oss.c
 libaccess_oss_plugin_la_LIBADD = $(OSS_LIBS)
 if HAVE_OSS
-access_LTLIBRARIES += libaccess_oss_plugin.la
+access_PLUGINS += libaccess_oss_plugin.la
 endif
 
 libaccess_jack_plugin_la_SOURCES = access/jack.c
 libaccess_jack_plugin_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
 libaccess_jack_plugin_la_LIBADD = $(JACK_LIBS)
 if HAVE_JACK
-access_LTLIBRARIES += libaccess_jack_plugin.la
+access_PLUGINS += libaccess_jack_plugin.la
 endif
 
 libpulsesrc_plugin_la_SOURCES = access/pulse.c
 libpulsesrc_plugin_la_CFLAGS= $(AM_CFLAGS) $(PULSE_CFLAGS)
 libpulsesrc_plugin_la_LIBADD = libvlc_pulse.la $(PULSE_LIBS)
 if HAVE_PULSE
-access_LTLIBRARIES += libpulsesrc_plugin.la
+access_PLUGINS += libpulsesrc_plugin.la
 endif
 
 libavaudiocapture_plugin_la_SOURCES = access/avaudiocapture.m
 libavaudiocapture_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc
 libavaudiocapture_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH) -Wl,-framework,Foundation -Wl,-framework,AVFoundation -Wl,-framework,CoreMedia
 if HAVE_AVFOUNDATION
-access_LTLIBRARIES += libavaudiocapture_plugin.la
+access_PLUGINS += libavaudiocapture_plugin.la
 endif
 
 libaccess_wasapi_plugin_la_SOURCES = access/wasapi.c
 libaccess_wasapi_plugin_la_LIBADD = $(LIBCOM) -lksuser
 if HAVE_WASAPI
 if !HAVE_WINSTORE
-access_LTLIBRARIES += libaccess_wasapi_plugin.la
+access_PLUGINS += libaccess_wasapi_plugin.la
 endif
 endif
 
@@ -100,21 +107,21 @@ libavcapture_plugin_la_SOURCES = access/avcapture.m
 libavcapture_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc
 libavcapture_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH) -Wl,-framework,Foundation -Wl,-framework,AVFoundation -Wl,-framework,CoreMedia,  -Wl,-framework,CoreVideo
 if HAVE_AVFOUNDATION
-access_LTLIBRARIES += libavcapture_plugin.la
+access_PLUGINS += libavcapture_plugin.la
 endif
 
 libdc1394_plugin_la_SOURCES = access/dc1394.c
 libdc1394_plugin_la_CFLAGS = $(AM_CFLAGS) $(DC1394_CFLAGS)
 libdc1394_plugin_la_LIBADD = $(DC1394_LIBS)
-access_LTLIBRARIES += $(LTLIBdc1394)
 libdc1394_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
+access_PLUGINS += $(LTLIBdc1394)
 EXTRA_LTLIBRARIES += libdc1394_plugin.la
 
 libdv1394_plugin_la_SOURCES = access/dv.c
 libdv1394_plugin_la_CFLAGS = $(AM_CFLAGS) $(DV1394_CFLAGS)
 libdv1394_plugin_la_LIBADD = $(DV1394_LIBS)
-access_LTLIBRARIES += $(LTLIBdv1394)
 libdv1394_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
+access_PLUGINS += $(LTLIBdv1394)
 EXTRA_LTLIBRARIES += libdv1394_plugin.la
 
 liblinsys_hdsdi_plugin_la_SOURCES = \
@@ -125,8 +132,8 @@ liblinsys_hdsdi_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
 liblinsys_sdi_plugin_la_SOURCES = access/linsys/linsys_sdi.c access/linsys/linsys_sdi.h
 liblinsys_sdi_plugin_la_CFLAGS = $(AM_CFLAGS) $(LINSYS_SDI_CFLAGS)
 liblinsys_sdi_plugin_la_LIBADD = $(LINSYS_SDI_LIBS)
-access_LTLIBRARIES += $(LTLIBlinsys_hdsdi) $(LTLIBlinsys_sdi)
 liblinsys_sdi_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
+access_PLUGINS += $(LTLIBlinsys_hdsdi) $(LTLIBlinsys_sdi)
 EXTRA_LTLIBRARIES += liblinsys_hdsdi_plugin.la liblinsys_sdi_plugin.la
 
 libdecklink_plugin_la_SOURCES = access/decklink.cpp access/sdi.c access/sdi.h access/vlc_decklink.h
@@ -140,12 +147,12 @@ if HAVE_LINUX
 libdecklink_plugin_la_LIBADD += $(LIBDL)
 endif
 if HAVE_DECKLINK
-access_LTLIBRARIES += libdecklink_plugin.la
+access_PLUGINS += libdecklink_plugin.la
 endif
 
 libshm_plugin_la_SOURCES = access/shm.c
 libshm_plugin_la_LIBADD = $(LIBM)
-access_LTLIBRARIES += libshm_plugin.la
+access_PLUGINS += libshm_plugin.la
 
 libv4l2_plugin_la_SOURCES = \
 	access/v4l2/linux/videodev2.h \
@@ -165,7 +172,7 @@ libv4l2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/access/v4l2
 libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS) $(ZVBI_CFLAGS)
 libv4l2_plugin_la_LIBADD = $(LIBDL) $(LIBM) $(ZVBI_LIBS)
 if HAVE_V4L2
-access_LTLIBRARIES += libv4l2_plugin.la
+access_PLUGINS += libv4l2_plugin.la
 endif
 
 libdshow_plugin_la_SOURCES = access/dshow/vlc_dshow.h access/dshow/dshow.cpp access/dshow/access.h \
@@ -174,7 +181,7 @@ libdshow_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DSTRSAFE_NO_DEPRECATE
 libdshow_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(LIBCOMCXXFLAGS)
 libdshow_plugin_la_LIBADD = $(LIBCOM) -luuid -lstrmiids -lksuser
 if HAVE_WIN32_DESKTOP
-access_LTLIBRARIES += libdshow_plugin.la
+access_PLUGINS += libdshow_plugin.la
 endif
 
 
@@ -185,7 +192,7 @@ libxcb_screen_plugin_la_CFLAGS = $(AM_CFLAGS) \
 	$(XCB_CFLAGS) $(XCB_COMPOSITE_CFLAGS) $(XCB_SHM_CFLAGS)
 libxcb_screen_plugin_la_LIBADD = $(XCB_LIBS) $(XCB_COMPOSITE_LIBS) $(XCB_SHM_LIBS)
 if HAVE_XCB
-access_LTLIBRARIES += libxcb_screen_plugin.la
+access_PLUGINS += libxcb_screen_plugin.la
 endif
 
 libwl_screenshooter_plugin_la_SOURCES = \
@@ -199,7 +206,7 @@ EXTRA_DIST += access/screen/screenshooter.xml
 CLEANFILES += $(nodist_libwl_screenshooter_plugin_la_SOURCES)
 if HAVE_WAYLAND
 BUILT_SOURCES += access/screen/screenshooter-client-protocol.h
-access_LTLIBRARIES += libwl_screenshooter_plugin.la
+access_PLUGINS += libwl_screenshooter_plugin.la
 endif
 
 libscreen_win_plugin_la_SOURCES = access/screen/screen.c access/screen/screen.h \
@@ -214,28 +221,28 @@ libscreen_win_plugin_la_SOURCES += access/screen/win32.c
 libscreen_win_plugin_la_LIBADD += -lgdi32
 endif
 if HAVE_WIN32
-access_LTLIBRARIES += libscreen_win_plugin.la
+access_PLUGINS += libscreen_win_plugin.la
 endif
 
 if HAVE_MAC_SCREEN
 libscreen_plugin_la_SOURCES = access/screen/screen.c access/screen/screen.h \
 	access/screen/mac.c
 libscreen_plugin_la_LDFLAGS = $(AM_LDFLAGS) "-Wl,-framework,OpenGL,-framework,ApplicationServices"
-access_LTLIBRARIES += libscreen_plugin.la
+access_PLUGINS += libscreen_plugin.la
 endif
 
 librdp_plugin_la_SOURCES = access/rdp.c
 librdp_plugin_la_CFLAGS = $(AM_CFLAGS) $(FREERDP_CFLAGS)
 librdp_plugin_la_LIBADD = $(FREERDP_LIBS)
-access_LTLIBRARIES += $(LTLIBrdp)
 librdp_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
+access_PLUGINS += $(LTLIBrdp)
 EXTRA_LTLIBRARIES += librdp_plugin.la
 
 libvnc_plugin_la_SOURCES = access/vnc.c
 libvnc_plugin_la_CFLAGS = $(AM_CFLAGS) $(VNC_CFLAGS)
 libvnc_plugin_la_LIBADD = $(VNC_LIBS)
-access_LTLIBRARIES += $(LTLIBvnc)
 libvnc_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
+access_PLUGINS += $(LTLIBvnc)
 EXTRA_LTLIBRARIES += libvnc_plugin.la
 
 
@@ -257,7 +264,7 @@ libcdda_plugin_la_CFLAGS += $(GCRYPT_CFLAGS)
 libcdda_plugin_la_LIBADD += $(GCRYPT_LIBS)
 endif
 EXTRA_LTLIBRARIES += libcdda_plugin.la
-access_LTLIBRARIES += $(LTLIBcdda)
+access_PLUGINS += $(LTLIBcdda)
 
 libvcd_plugin_la_SOURCES = access/vcd/vcd.c access/vcd/cdrom.c access/vcd/cdrom.h access/vcd/cdrom_internals.h
 libvcd_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
@@ -266,7 +273,7 @@ libvcd_plugin_la_LIBADD = -liconv
 libvcd_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
 endif
 EXTRA_LTLIBRARIES += libvcd_plugin.la
-access_LTLIBRARIES += $(LTLIBvcd)
+access_PLUGINS += $(LTLIBvcd)
 
 libdvdnav_plugin_la_SOURCES = access/disc_helper.h access/dvdnav.c demux/mpeg/ps.h demux/mpeg/pes.h
 libdvdnav_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS)
@@ -275,7 +282,7 @@ libdvdnav_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
 if HAVE_DARWIN
 libdvdnav_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
 endif
-access_LTLIBRARIES += $(LTLIBdvdnav)
+access_PLUGINS += $(LTLIBdvdnav)
 EXTRA_LTLIBRARIES += libdvdnav_plugin.la
 
 libdvdread_plugin_la_SOURCES = access/disc_helper.h access/dvdread.c demux/mpeg/ps.h demux/mpeg/pes.h \
@@ -286,14 +293,14 @@ libdvdread_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
 if HAVE_DARWIN
 libdvdread_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
 endif
-access_LTLIBRARIES += $(LTLIBdvdread)
+access_PLUGINS += $(LTLIBdvdread)
 EXTRA_LTLIBRARIES += libdvdread_plugin.la
 
 liblibbluray_plugin_la_SOURCES = access/bluray.c demux/mpeg/timestamps.h
 liblibbluray_plugin_la_CFLAGS = $(AM_CFLAGS) $(BLURAY_CFLAGS)
 liblibbluray_plugin_la_LIBADD = $(BLURAY_LIBS)
-access_LTLIBRARIES += $(LTLIBlibbluray)
 liblibbluray_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
+access_PLUGINS += $(LTLIBlibbluray)
 EXTRA_LTLIBRARIES += liblibbluray_plugin.la
 
 ### Digital TV ###
@@ -309,7 +316,7 @@ libdtv_plugin_la_SOURCES += access/dtv/linux.c \
                             access/dtv/en50221.h \
                             access/dtv/en50221_capmt.h
 libdtv_plugin_la_CFLAGS += -DHAVE_LINUX_DVB
-access_LTLIBRARIES += libdtv_plugin.la
+access_PLUGINS += libdtv_plugin.la
 endif
 
 if HAVE_WIN32_DESKTOP
@@ -323,7 +330,7 @@ noinst_LTLIBRARIES += libbda.la
 
 libdtv_plugin_la_DEPENDENCIES = libbda.la
 libdtv_plugin_la_LIBADD = libbda.la -lstdc++
-access_LTLIBRARIES += libdtv_plugin.la
+access_PLUGINS += libdtv_plugin.la
 endif
 
 # Old Linux DVB scanner
@@ -337,7 +344,7 @@ libdvb_plugin_la_CFLAGS = $(AM_CFLAGS)
 if HAVE_LINUX_DVB
 if HAVE_DVBPSI
 libdvb_plugin_la_SOURCES += mux/mpeg/dvbpsi_compat.h
-access_LTLIBRARIES += libdvb_plugin.la
+access_PLUGINS += libdvb_plugin.la
 libdvb_plugin_la_CFLAGS += $(DVBPSI_CFLAGS)
 libdvb_plugin_la_LIBADD = $(DVBPSI_LIBS)
 endif
@@ -347,15 +354,15 @@ endif
 
 libftp_plugin_la_SOURCES = access/ftp.c
 libftp_plugin_la_LIBADD = $(SOCKET_LIBS)
-access_LTLIBRARIES += libftp_plugin.la
+access_PLUGINS += libftp_plugin.la
 
 libgopher_plugin_la_SOURCES = access/gopher.c
 libgopher_plugin_la_LIBADD = $(SOCKET_LIBS)
-access_LTLIBRARIES += libgopher_plugin.la
+access_PLUGINS += libgopher_plugin.la
 
 libhttp_plugin_la_SOURCES = access/http.c
 libhttp_plugin_la_LIBADD = $(SOCKET_LIBS)
-access_LTLIBRARIES += libhttp_plugin.la
+access_PLUGINS += libhttp_plugin.la
 
 liblive555_plugin_la_SOURCES = access/live555.cpp access/mms/asf.c access/mms/buffer.c \
                                access/live555_dtsgen.h codec/opus_header.c codec/opus_header.h
@@ -363,7 +370,7 @@ liblive555_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_live555)
 liblive555_plugin_la_LIBADD = $(LIBS_live555) $(SOCKET_LIBS)
 liblive555_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH) \
 	$(LDFLAGS_live555)
-access_LTLIBRARIES += $(LTLIBlive555)
+access_PLUGINS += $(LTLIBlive555)
 EXTRA_LTLIBRARIES += liblive555_plugin.la
 
 libaccess_mms_plugin_la_SOURCES = \
@@ -375,20 +382,20 @@ libaccess_mms_plugin_la_SOURCES = \
 	demux/asf/libasf_guid.h
 libaccess_mms_plugin_la_CFLAGS = $(AM_CFLAGS)
 libaccess_mms_plugin_la_LIBADD = $(SOCKET_LIBS)
-access_LTLIBRARIES += libaccess_mms_plugin.la
+access_PLUGINS += libaccess_mms_plugin.la
 
 libsmbc_plugin_la_SOURCES = access/samba.c access/smb_common.h
 libsmbc_plugin_la_CFLAGS = $(AM_CFLAGS) $(SMBCLIENT_CFLAGS)
 libsmbc_plugin_la_LIBADD = $(SMBCLIENT_LIBS)
-access_LTLIBRARIES += $(LTLIBsmbc)
 libsmbc_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
+access_PLUGINS += $(LTLIBsmbc)
 EXTRA_LTLIBRARIES += libsmbc_plugin.la
 
 libdsm_plugin_la_SOURCES = access/dsm/access.c access/dsm/sd.c access/smb_common.h
 libdsm_plugin_la_CFLAGS = $(AM_CFLAGS) $(DSM_CFLAGS)
 libdsm_plugin_la_LIBADD = $(DSM_LIBS) libvlc_access_cache.la
 if HAVE_DSM
-access_LTLIBRARIES += libdsm_plugin.la
+access_PLUGINS += libdsm_plugin.la
 endif
 
 libsmb2_plugin_la_SOURCES = access/smb2.c
@@ -399,41 +406,41 @@ if HAVE_DSM
 libsmb2_plugin_la_CFLAGS += $(DSM_CFLAGS) -DHAVE_DSM
 libsmb2_plugin_la_LIBADD += $(DSM_LIBS)
 endif
-access_LTLIBRARIES += $(LTLIBsmb2)
+access_PLUGINS += $(LTLIBsmb2)
 EXTRA_LTLIBRARIES += libsmb2_plugin.la
 
 libtcp_plugin_la_SOURCES = access/tcp.c
 libtcp_plugin_la_LIBADD = $(SOCKET_LIBS)
-access_LTLIBRARIES += libtcp_plugin.la
+access_PLUGINS += libtcp_plugin.la
 
 libudp_plugin_la_SOURCES = access/udp.c
 libudp_plugin_la_LIBADD = $(SOCKET_LIBS)
-access_LTLIBRARIES += libudp_plugin.la
+access_PLUGINS += libudp_plugin.la
 
 libamt_plugin_la_SOURCES = access/amt.c
 libamt_plugin_la_LIBADD = $(SOCKET_LIBS)
-access_LTLIBRARIES += libamt_plugin.la
+access_PLUGINS += libamt_plugin.la
 
 libunc_plugin_la_SOURCES = access/unc.c access/smb_common.h
 libunc_plugin_la_LIBADD = -lmpr -lnetapi32
 if HAVE_WIN32
 if !HAVE_WINSTORE
-access_LTLIBRARIES += libunc_plugin.la
+access_PLUGINS += libunc_plugin.la
 endif
 endif
 
 libsftp_plugin_la_SOURCES = access/sftp.c
 libsftp_plugin_la_CFLAGS = $(AM_CFLAGS) $(SFTP_CFLAGS)
 libsftp_plugin_la_LIBADD = $(SFTP_LIBS)
-access_LTLIBRARIES += $(LTLIBsftp)
 libsftp_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
+access_PLUGINS += $(LTLIBsftp)
 EXTRA_LTLIBRARIES += libsftp_plugin.la
 
 libnfs_plugin_la_SOURCES = access/nfs.c
 libnfs_plugin_la_CFLAGS = $(AM_CFLAGS) $(NFS_CFLAGS)
 libnfs_plugin_la_LIBADD = $(NFS_LIBS) $(SOCKET_LIBS)
-access_LTLIBRARIES += $(LTLIBnfs)
 libnfs_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
+access_PLUGINS += $(LTLIBnfs)
 EXTRA_LTLIBRARIES += libnfs_plugin.la
 
 libavio_plugin_la_SOURCES = access/avio.c access/avio.h
@@ -442,24 +449,24 @@ libavio_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS)
 libavio_plugin_la_LIBADD = $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM)
 if HAVE_AVFORMAT
 if !MERGE_FFMPEG
-access_LTLIBRARIES += libavio_plugin.la
+access_PLUGINS += libavio_plugin.la
 endif
 endif
 
 libsatip_plugin_la_SOURCES = access/satip.c
 libsatip_plugin_la_LIBADD = $(SOCKET_LIBS)
-access_LTLIBRARIES += libsatip_plugin.la
+access_PLUGINS += libsatip_plugin.la
 
 ### Misc ###
 
 libaccess_concat_plugin_la_SOURCES = access/concat.c
-access_LTLIBRARIES += libaccess_concat_plugin.la
+access_PLUGINS += libaccess_concat_plugin.la
 
 libaccess_mtp_plugin_la_SOURCES = access/mtp.c
 libaccess_mtp_plugin_la_CFLAGS = $(AM_CFLAGS) $(MTP_CFLAGS)
 libaccess_mtp_plugin_la_LIBADD = $(MTP_LIBS)
-access_LTLIBRARIES += $(LTLIBaccess_mtp)
 libaccess_mtp_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
+access_PLUGINS += $(LTLIBaccess_mtp)
 EXTRA_LTLIBRARIES += libaccess_mtp_plugin.la
 
 ### SRT ###
@@ -468,8 +475,8 @@ libaccess_srt_plugin_la_SOURCES = access/srt.c access/srt_common.c access/srt_co
 libaccess_srt_plugin_la_CFLAGS = $(AM_CFLAGS) $(SRT_CFLAGS)
 libaccess_srt_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SRT_CPPFLAGS)
 libaccess_srt_plugin_la_LIBADD = $(SRT_LIBS)
-access_LTLIBRARIES += $(LTLIBaccess_srt)
 libaccess_srt_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
+access_PLUGINS += $(LTLIBaccess_srt)
 EXTRA_LTLIBRARIES += libaccess_srt_plugin.la
 
 ### RIST ###
@@ -478,7 +485,7 @@ librist_plugin_la_SOURCES = access/rist.c access/rist.h
 librist_plugin_la_CFLAGS = $(AM_CFLAGS) $(RIST_CFLAGS)
 librist_plugin_la_LIBADD = $(RIST_LIBS) $(SOCKET_LIBS)
 librist_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_RPATH)
-access_LTLIBRARIES += $(LTLIBrist)
+access_PLUGINS += $(LTLIBrist)
 EXTRA_LTLIBRARIES += librist_plugin.la
 
 ### TOOLS ###

modules/access/http/Makefile.am

@@ -1,6 +1,6 @@
 libhttps_plugin_la_SOURCES = access/http/access.c
 libhttps_plugin_la_LIBADD = libvlc_http.la
-access_LTLIBRARIES += libhttps_plugin.la
+access_PLUGINS += libhttps_plugin.la
 
 libvlc_http_la_SOURCES = \
 	access/http/transport.h \

modules/access/rtp/Makefile.am

@@ -1,5 +1,16 @@
+rtpparse_LTLIBRARIES =
+rtpparse_PLUGINS =
+rtpparse_RPATH =
+
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(rtpparse_PLUGINS)
+else
+rtpparse_LTLIBRARIES += $(rtpparse_PLUGINS)
+rtpparse_RPATH += -rpath '$(rtpparsedir)'
+endif
+
 # RTP plugin
-access_LTLIBRARIES += librtp_plugin.la
+access_PLUGINS += librtp_plugin.la
 librtp_plugin_la_SOURCES = \
 	access/rtp/input.c \
 	access/rtp/session.c \
@@ -32,7 +43,7 @@ noinst_HEADERS += access/rtp/fmtp.h
 
 # RTP payload parser plugins
 rtpparsedir = $(accessdir)/rtp
-rtpparse_LTLIBRARIES = \
+rtpparse_PLUGINS += \
 	librtp_ac3_plugin.la \
 	librtp_mpeg12_plugin.la \
 	librtp_pcm_plugin.la \

modules/access_output/Makefile.am

@@ -1,12 +1,20 @@
 access_outdir = $(pluginsdir)/access_output
+access_out_LTLIBRARIES =
+access_out_PLUGINS =
 access_out_RPATH =
+
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(access_out_PLUGINS)
+else
+access_out_LTLIBRARIES += $(access_out_PLUGINS)
 access_out_RPATH += -rpath '$(access_outdir)'
+endif
 
 libaccess_output_dummy_plugin_la_SOURCES = access_output/dummy.c
 libaccess_output_file_plugin_la_SOURCES = access_output/file.c
 libaccess_output_http_plugin_la_SOURCES = access_output/http.c
 
-access_out_LTLIBRARIES = \
+access_out_PLUGINS += \
 	libaccess_output_dummy_plugin.la \
 	libaccess_output_file_plugin.la \
 	libaccess_output_http_plugin.la
@@ -15,28 +23,28 @@ libaccess_output_livehttp_plugin_la_SOURCES = access_output/livehttp.c
 libaccess_output_livehttp_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
 libaccess_output_livehttp_plugin_la_LIBADD = $(GCRYPT_LIBS) -lgpg-error $(LIBM)
 if HAVE_GCRYPT
-access_out_LTLIBRARIES += libaccess_output_livehttp_plugin.la
+access_out_PLUGINS += libaccess_output_livehttp_plugin.la
 endif
 
 libaccess_output_shout_plugin_la_SOURCES = access_output/shout.c
 libaccess_output_shout_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SHOUT_CFLAGS)
 libaccess_output_shout_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_out_RPATH)
 libaccess_output_shout_plugin_la_LIBADD = $(SHOUT_LIBS) $(SOCKET_LIBS)
-access_out_LTLIBRARIES += $(LTLIBaccess_output_shout)
+access_out_PLUGINS += $(LTLIBaccess_output_shout)
 EXTRA_LTLIBRARIES += libaccess_output_shout_plugin.la
 
-libaccess_http_put_plugin_la_SOURCES = access_output/http-put.c
-libaccess_http_put_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/access/http
-libaccess_http_put_plugin_la_LIBADD = libvlc_http.la
-access_out_LTLIBRARIES += libaccess_http_put_plugin.la
+#libaccess_http_put_plugin_la_SOURCES = access_output/http-put.c
+#libaccess_http_put_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/access/http
+#libaccess_http_put_plugin_la_LIBADD = libvlc_http.la
+#access_out_PLUGINS += libaccess_http_put_plugin.la
 
 ### SRT ###
 libaccess_output_srt_plugin_la_SOURCES = access_output/srt.c access/srt_common.c access/srt_common.h
 libaccess_output_srt_plugin_la_CFLAGS = $(AM_CFLAGS) $(SRT_CFLAGS)
 libaccess_output_srt_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SRT_CPPFLAGS)
 libaccess_output_srt_plugin_la_LIBADD = $(SRT_LIBS)
-access_out_LTLIBRARIES += $(LTLIBaccess_output_srt)
 libaccess_output_srt_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_out_RPATH)
+access_out_PLUGINS += $(LTLIBaccess_output_srt)
 EXTRA_LTLIBRARIES += libaccess_output_srt_plugin.la
 
 ### RIST ###
@@ -45,5 +53,5 @@ libaccess_output_rist_plugin_la_SOURCES = access_output/rist.c
 libaccess_output_rist_plugin_la_CFLAGS = $(AM_CFLAGS) $(RIST_CFLAGS)
 libaccess_output_rist_plugin_la_LIBADD = $(RIST_LIBS) $(SOCKET_LIBS)
 libaccess_output_rist_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(access_out_RPATH)
-access_out_LTLIBRARIES += $(LTLIBaccess_output_rist)
+access_out_PLUGINS += $(LTLIBaccess_output_rist)
 EXTRA_LTLIBRARIES += libaccess_output_rist_plugin.la

modules/audio_filter/Makefile.am

@@ -1,6 +1,15 @@
 audio_filterdir = $(pluginsdir)/audio_filter
+audio_filter_PLUGINS =
+audio_filter_LTLIBRARIES =
 audio_filter_RPATH =
+
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(audio_filter_PLUGINS)
+else
+audio_filter_LTLIBRARIES += $(audio_filter_PLUGINS)
 audio_filter_RPATH += -rpath '$(audio_filterdir)'
+endif
+
 
 libaudiobargraph_a_plugin_la_SOURCES = audio_filter/audiobargraph_a.c
 libaudiobargraph_a_plugin_la_LIBADD = $(LIBM)
@@ -40,7 +49,7 @@ libcenter_plugin_la_LIBADD  = $(LIBM)
 libstereopan_plugin_la_SOURCES = audio_filter/stereo_pan.c
 libstereopan_plugin_la_LIBADD = $(LIBM)
 
-audio_filter_LTLIBRARIES = \
+audio_filter_PLUGINS += \
 	libaudiobargraph_a_plugin.la \
 	libchorus_flanger_plugin.la \
 	libcompressor_plugin.la \
@@ -85,7 +94,7 @@ libsimple_channel_mixer_plugin_la_SOURCES += \
 	audio_filter/channel_mixer/simple_neon.h
 endif
 
-audio_filter_LTLIBRARIES += \
+audio_filter_PLUGINS += \
 	libdolby_surround_decoder_plugin.la \
 	libheadphone_channel_mixer_plugin.la \
 	libmono_plugin.la \
@@ -100,7 +109,7 @@ libspatialaudio_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(SPATIALAUDIO_CFLAGS)
 libspatialaudio_plugin_la_LIBADD = $(SPATIALAUDIO_LIBS)
 libspatialaudio_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(audio_filter_RPATH)
 EXTRA_LTLIBRARIES += libspatialaudio_plugin.la
-audio_filter_LTLIBRARIES += $(LTLIBspatialaudio)
+audio_filter_PLUGINS += $(LTLIBspatialaudio)
 
 # Converters
 libaudio_format_plugin_la_SOURCES = audio_filter/converter/format.c
@@ -111,7 +120,7 @@ libtospdif_plugin_la_SOURCES = audio_filter/converter/tospdif.c \
 	packetizer/a52.h \
 	packetizer/dts_header.c packetizer/dts_header.h
 
-audio_filter_LTLIBRARIES += \
+audio_filter_PLUGINS += \
 	libtospdif_plugin.la \
 	libaudio_format_plugin.la
 
@@ -135,7 +144,7 @@ libebur128_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(EBUR128_CFLAGS)
 libebur128_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(audio_filter_RPATH)
 libebur128_plugin_la_LIBADD = $(EBUR128_LIBS)
 
-audio_filter_LTLIBRARIES += \
+audio_filter_PLUGINS += \
 	$(LTLIBsamplerate) \
 	$(LTLIBsoxr) \
 	$(LTLIBebur128) \
@@ -150,7 +159,7 @@ libspeex_resampler_plugin_la_SOURCES = audio_filter/resampler/speex.c
 libspeex_resampler_plugin_la_CFLAGS = $(AM_CFLAGS) $(SPEEXDSP_CFLAGS)
 libspeex_resampler_plugin_la_LIBADD = $(SPEEXDSP_LIBS)
 if HAVE_SPEEXDSP
-audio_filter_LTLIBRARIES += libspeex_resampler_plugin.la
+audio_filter_PLUGINS += libspeex_resampler_plugin.la
 endif
 
 librnnoise_plugin_la_SOURCES = audio_filter/rnnoise.c
@@ -158,5 +167,5 @@ librnnoise_plugin_la_CFLAGS = $(AM_CFLAGS) $(RNNOISE_CFLAGS)
 librnnoise_plugin_la_LIBADD = $(RNNOISE_LIBS) $(LIBM)
 librnnoise_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(audio_filter_RPATH)
 
-audio_filter_LTLIBRARIES += $(LTLIBrnnoise)
+audio_filter_PLUGINS += $(LTLIBrnnoise)
 EXTRA_LTLIBRARIES += librnnoise_plugin.la

modules/audio_mixer/Makefile.am

@@ -8,6 +8,13 @@ libinteger_mixer_plugin_la_SOURCES = audio_mixer/integer.c
 libinteger_mixer_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libinteger_mixer_plugin_la_LIBADD = $(LIBM)
 
-audio_mixer_LTLIBRARIES = \
+audio_mixer_PLUGINS = \
 	libfloat_mixer_plugin.la \
 	libinteger_mixer_plugin.la
+
+audio_mixer_LTLIBRARIES =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(audio_mixer_PLUGINS)
+else
+audio_mixer_LTLIBRARIES += $(audio_mixer_PLUGINS)
+endif

modules/audio_output/Makefile.am

@@ -1,7 +1,15 @@
 aoutdir = $(pluginsdir)/audio_output
+aout_PLUGINS =
 aout_LTLIBRARIES =
 aout_RPATH =
+
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(aout_PLUGINS)
+else
+aout_LTLIBRARIES += $(aout_PLUGINS)
 aout_RPATH += -rpath '$(aoutdir)'
+endif
+
 
 libopensles_android_plugin_la_SOURCES = audio_output/android/opensles.c
 libopensles_android_plugin_la_LIBADD = libandroid_utils.la $(LIBDL) $(LIBM)
@@ -15,7 +23,7 @@ libandroid_aaudio_plugin_la_LIBADD = libandroid_utils.la $(LIBDL)
 libandroid_audiodevice_plugin_la_SOURCES = audio_output/android/device.c audio_output/android/device.h
 
 if HAVE_ANDROID
-aout_LTLIBRARIES += libandroid_audiodevice_plugin.la libopensles_android_plugin.la \
+aout_PLUGINS += libandroid_audiodevice_plugin.la libopensles_android_plugin.la \
 	libandroid_audiotrack_plugin.la libandroid_aaudio_plugin.la
 endif
 
@@ -26,7 +34,7 @@ libafile_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 
 libamem_plugin_la_SOURCES = audio_output/amem.c
 
-aout_LTLIBRARIES += \
+aout_PLUGINS += \
 	libadummy_plugin.la \
 	libafile_plugin.la \
 	libamem_plugin.la
@@ -34,14 +42,14 @@ aout_LTLIBRARIES += \
 liboss_plugin_la_SOURCES = audio_output/oss.c audio_output/volume.h
 liboss_plugin_la_LIBADD = $(OSS_LIBS) $(LIBM)
 if HAVE_OSS
-aout_LTLIBRARIES += liboss_plugin.la
+aout_PLUGINS += liboss_plugin.la
 endif
 
 libalsa_plugin_la_SOURCES = audio_output/alsa.c audio_output/volume.h
 libalsa_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
 libalsa_plugin_la_LIBADD = $(ALSA_LIBS) $(LIBM)
 if HAVE_ALSA
-aout_LTLIBRARIES += libalsa_plugin.la
+aout_PLUGINS += libalsa_plugin.la
 endif
 
 libvlc_pulse_la_SOURCES = audio_output/vlcpulse.c audio_output/vlcpulse.h
@@ -56,14 +64,14 @@ libpulse_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
 libpulse_plugin_la_LIBADD = libvlc_pulse.la $(PULSE_LIBS) $(LIBM)
 if HAVE_PULSE
 pkglib_LTLIBRARIES += libvlc_pulse.la
-aout_LTLIBRARIES += libpulse_plugin.la
+aout_PLUGINS += libpulse_plugin.la
 endif
 
 libjack_plugin_la_SOURCES = audio_output/jack.c audio_output/volume.h
 libjack_plugin_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
 libjack_plugin_la_LIBADD = $(JACK_LIBS) $(LIBM)
 if HAVE_JACK
-aout_LTLIBRARIES += libjack_plugin.la
+aout_PLUGINS += libjack_plugin.la
 endif
 
 libmmdevice_plugin_la_SOURCES = audio_output/mmdevice.c audio_output/mmdevice.h
@@ -73,31 +81,31 @@ libwinstore_plugin_la_LIBADD = $(LIBCOM) -lmmdevapi
 libwasapi_plugin_la_SOURCES = audio_output/wasapi.c
 libwasapi_plugin_la_LIBADD = $(LIBCOM) -lksuser
 if HAVE_WASAPI
-aout_LTLIBRARIES += libwasapi_plugin.la
+aout_PLUGINS += libwasapi_plugin.la
 if !HAVE_WINSTORE
-aout_LTLIBRARIES += libmmdevice_plugin.la
+aout_PLUGINS += libmmdevice_plugin.la
 else
-aout_LTLIBRARIES += libwinstore_plugin.la
+aout_PLUGINS += libwinstore_plugin.la
 endif
 endif
 
 libkai_plugin_la_SOURCES = audio_output/kai.c
 libkai_plugin_la_LIBADD = $(KAI_LIBS)
 if HAVE_KAI
-aout_LTLIBRARIES += libkai_plugin.la
+aout_PLUGINS += libkai_plugin.la
 endif
 
 libsndio_plugin_la_SOURCES = audio_output/sndio.c
 libsndio_plugin_la_LIBADD = -lsndio $(LIBM)
 if HAVE_SNDIO
-aout_LTLIBRARIES += libsndio_plugin.la
+aout_PLUGINS += libsndio_plugin.la
 endif
 
 libwaveout_plugin_la_SOURCES = audio_output/waveout.c \
 	audio_output/windows_audio_common.h
 libwaveout_plugin_la_LIBADD = -lwinmm
 if HAVE_WIN32_DESKTOP
-aout_LTLIBRARIES += libwaveout_plugin.la
+aout_PLUGINS += libwaveout_plugin.la
 endif
 
 libauhal_plugin_la_SOURCES = audio_output/auhal.c \
@@ -105,15 +113,15 @@ libauhal_plugin_la_SOURCES = audio_output/auhal.c \
 libauhal_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(aout_RPATH) \
 	-Wl,-framework,CoreAudio,-framework,AudioUnit,-framework,AudioToolbox,-framework,CoreServices
 if HAVE_OSX
-aout_LTLIBRARIES += libauhal_plugin.la
+aout_PLUGINS += libauhal_plugin.la
 endif
 libaudiounit_ios_plugin_la_SOURCES = audio_output/audiounit_ios.m \
 	audio_output/coreaudio_common.c audio_output/coreaudio_common.h
 libaudiounit_ios_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(aout_RPATH) \
 	-Wl,-framework,Foundation,-framework,CoreAudio,-framework,AudioToolbox,-framework,UIKit,-framework,AVFoundation
 if HAVE_IOS
-aout_LTLIBRARIES += libaudiounit_ios_plugin.la
+aout_PLUGINS += libaudiounit_ios_plugin.la
 endif
 if HAVE_TVOS
-aout_LTLIBRARIES += libaudiounit_ios_plugin.la
+aout_PLUGINS += libaudiounit_ios_plugin.la
 endif

modules/codec/Makefile.am

@@ -1,56 +1,64 @@
 codecdir = $(pluginsdir)/codec
 codec_LTLIBRARIES =
+codec_PLUGINS =
+
 codec_RPATH =
+
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(codec_PLUGINS)
+else
+codec_LTLIBRARIES += $(codec_PLUGINS)
 codec_RPATH += -rpath '$(codecdir)'
+endif
 
 AM_CPPFLAGS += -I$(srcdir)/codec
 
 libddummy_plugin_la_SOURCES = codec/ddummy.c
-codec_LTLIBRARIES += libddummy_plugin.la
+codec_PLUGINS += libddummy_plugin.la
 
 libedummy_plugin_la_SOURCES = codec/edummy.c
 if ENABLE_SOUT
-codec_LTLIBRARIES += libedummy_plugin.la
+codec_PLUGINS += libedummy_plugin.la
 endif
 
 
 ### Audio codecs ###
 libspdif_plugin_la_SOURCES = codec/spdif.c
-codec_LTLIBRARIES += libspdif_plugin.la
+codec_PLUGINS += libspdif_plugin.la
 
 liba52_plugin_la_SOURCES = codec/a52.c
 liba52_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_a52)
 liba52_plugin_la_LIBADD = $(LIBS_a52)
 liba52_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_a52) $(codec_RPATH)
 EXTRA_LTLIBRARIES += liba52_plugin.la
-codec_LTLIBRARIES += $(LTLIBa52)
+codec_PLUGINS += $(LTLIBa52)
 
 libdca_plugin_la_SOURCES = codec/dca.c
 libdca_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DCA_CFLAGS)
 libdca_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libdca_plugin_la_LIBADD = $(LIBM) $(DCA_LIBS)
 EXTRA_LTLIBRARIES += libdca_plugin.la
-codec_LTLIBRARIES += $(LTLIBdca)
+codec_PLUGINS += $(LTLIBdca)
 
 libadpcm_plugin_la_SOURCES = codec/adpcm.c
-codec_LTLIBRARIES += libadpcm_plugin.la
+codec_PLUGINS += libadpcm_plugin.la
 
 libaes3_plugin_la_SOURCES = codec/aes3.c
-codec_LTLIBRARIES += libaes3_plugin.la
+codec_PLUGINS += libaes3_plugin.la
 
 libaraw_plugin_la_SOURCES = codec/araw.c
 libaraw_plugin_la_LIBADD = $(LIBM)
-codec_LTLIBRARIES += libaraw_plugin.la
+codec_PLUGINS += libaraw_plugin.la
 
 libfaad_plugin_la_SOURCES = codec/faad.c packetizer/mpeg4audio.h
 libfaad_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_faad)
 libfaad_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libfaad_plugin_la_LIBADD = $(LIBS_faad) $(LIBM)
 EXTRA_LTLIBRARIES += libfaad_plugin.la
-codec_LTLIBRARIES += $(LTLIBfaad)
+codec_PLUGINS += $(LTLIBfaad)
 
 libg711_plugin_la_SOURCES = codec/g711.c
-codec_LTLIBRARIES += libg711_plugin.la
+codec_PLUGINS += libg711_plugin.la
 
 libfluidsynth_plugin_la_SOURCES = codec/fluidsynth.c
 libfluidsynth_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DDATADIR=\"$(datadir)\"
@@ -58,7 +66,7 @@ libfluidsynth_plugin_la_CFLAGS = $(AM_CFLAGS) $(FLUIDSYNTH_CFLAGS)
 libfluidsynth_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libfluidsynth_plugin_la_LIBADD = $(FLUIDSYNTH_LIBS)
 EXTRA_LTLIBRARIES += libfluidsynth_plugin.la
-codec_LTLIBRARIES += $(LTLIBfluidsynth)
+codec_PLUGINS += $(LTLIBfluidsynth)
 if HAVE_DARWIN
 libfluidsynth_plugin_la_LDFLAGS += -Wl,-framework,CoreFoundation,-framework,CoreServices
 endif
@@ -66,17 +74,17 @@ endif
 libaudiotoolboxmidi_plugin_la_SOURCES = codec/audiotoolbox_midi.c
 libaudiotoolboxmidi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,CoreFoundation,-framework,AudioToolbox
 if HAVE_DARWIN
-codec_LTLIBRARIES += libaudiotoolboxmidi_plugin.la
+codec_PLUGINS += libaudiotoolboxmidi_plugin.la
 endif
 
 liblpcm_plugin_la_SOURCES = codec/lpcm.c
-codec_LTLIBRARIES += liblpcm_plugin.la
+codec_PLUGINS += liblpcm_plugin.la
 
 libmad_plugin_la_SOURCES = codec/mad.c
 libmad_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(MAD_CFLAGS)
 libmad_plugin_la_LIBADD = $(AM_LIBADD) $(MAD_LIBS)
 if HAVE_MAD
-audio_filter_LTLIBRARIES += libmad_plugin.la
+audio_filter_PLUGINS += libmad_plugin.la
 endif
 
 libmpg123_plugin_la_SOURCES = codec/mpg123.c
@@ -84,22 +92,22 @@ libmpg123_plugin_la_CFLAGS = $(AM_CFLAGS) $(MPG123_CFLAGS)
 libmpg123_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libmpg123_plugin_la_LIBADD = $(MPG123_LIBS)
 EXTRA_LTLIBRARIES += libmpg123_plugin.la
-codec_LTLIBRARIES += $(LTLIBmpg123)
+codec_PLUGINS += $(LTLIBmpg123)
 
 libuleaddvaudio_plugin_la_SOURCES = codec/uleaddvaudio.c
-codec_LTLIBRARIES += libuleaddvaudio_plugin.la
+codec_PLUGINS += libuleaddvaudio_plugin.la
 
 ### Video codecs ###
 
 libcdg_plugin_la_SOURCES = codec/cdg.c
-codec_LTLIBRARIES += libcdg_plugin.la
+codec_PLUGINS += libcdg_plugin.la
 
 libdavs2_plugin_la_SOURCES = codec/davs2.c
 libdavs2_plugin_la_CFLAGS = $(AM_CFLAGS) $(DAVS2_CFLAGS)
 libdavs2_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libdavs2_plugin_la_LIBADD = $(DAVS2_LIBS) $(LIBM)
 EXTRA_LTLIBRARIES += libdavs2_plugin.la
-codec_LTLIBRARIES += $(LTLIBdavs2)
+codec_PLUGINS += $(LTLIBdavs2)
 
 liblibmpeg2_plugin_la_SOURCES = codec/libmpeg2.c \
 	codec/synchro.c codec/synchro.h
@@ -107,14 +115,14 @@ liblibmpeg2_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_libmpeg2)
 liblibmpeg2_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 liblibmpeg2_plugin_la_LIBADD = $(LIBS_libmpeg2)
 EXTRA_LTLIBRARIES += liblibmpeg2_plugin.la
-codec_LTLIBRARIES += $(LTLIBlibmpeg2)
+codec_PLUGINS += $(LTLIBlibmpeg2)
 
 librawvideo_plugin_la_SOURCES = codec/rawvideo.c
-codec_LTLIBRARIES += librawvideo_plugin.la
+codec_PLUGINS += librawvideo_plugin.la
 
 librtpvideo_plugin_la_SOURCES = codec/rtpvideo.c
 if ENABLE_SOUT
-codec_LTLIBRARIES += librtpvideo_plugin.la
+codec_PLUGINS += librtpvideo_plugin.la
 endif
 
 
@@ -123,10 +131,10 @@ libschroedinger_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_schroedinger)
 libschroedinger_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libschroedinger_plugin_la_LIBADD = $(LIBS_schroedinger)
 EXTRA_LTLIBRARIES += libschroedinger_plugin.la
-codec_LTLIBRARIES += $(LTLIBschroedinger)
+codec_PLUGINS += $(LTLIBschroedinger)
 
 librtp_rawvid_plugin_la_SOURCES = codec/rtp-rawvid.c
-codec_LTLIBRARIES += librtp_rawvid_plugin.la
+codec_PLUGINS += librtp_rawvid_plugin.la
 
 
 ### Image codecs ###
@@ -135,33 +143,33 @@ libpng_plugin_la_SOURCES = codec/png.c
 libpng_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libpng_plugin_la_LIBADD = -lpng -lz $(LIBM)
 EXTRA_LTLIBRARIES += libpng_plugin.la
-codec_LTLIBRARIES += $(LTLIBpng)
+codec_PLUGINS += $(LTLIBpng)
 
 libjpeg_plugin_la_SOURCES = codec/jpeg.c
 libjpeg_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libjpeg_plugin_la_LIBADD = -ljpeg
 EXTRA_LTLIBRARIES += libjpeg_plugin.la
-codec_LTLIBRARIES += $(LTLIBjpeg)
+codec_PLUGINS += $(LTLIBjpeg)
 
 libbpg_plugin_la_SOURCES = codec/bpg.c
 libbpg_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libbpg_plugin_la_LIBADD = -lbpg
 EXTRA_LTLIBRARIES += libbpg_plugin.la
-codec_LTLIBRARIES += $(LTLIBbpg)
+codec_PLUGINS += $(LTLIBbpg)
 
 libsvgdec_plugin_la_SOURCES = codec/svg.c
 libsvgdec_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_svgdec)
 libsvgdec_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_svg) $(codec_RPATH)
 libsvgdec_plugin_la_LIBADD = $(LIBS_svgdec)
 EXTRA_LTLIBRARIES += libsvgdec_plugin.la
-codec_LTLIBRARIES += $(LTLIBsvgdec)
+codec_PLUGINS += $(LTLIBsvgdec)
 
 libxwd_plugin_la_SOURCES = codec/xwd.c
 libxwd_plugin_la_CFLAGS = $(AM_CFLAGS) $(XPROTO_CFLAGS)
 libxwd_plugin_la_LIBADD = $(XPROTO_LIBS)
 libxwd_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 if HAVE_XCB
-codec_LTLIBRARIES += libxwd_plugin.la
+codec_PLUGINS += libxwd_plugin.la
 endif
 
 
@@ -176,58 +184,58 @@ if HAVE_WINSTORE
 liblibass_plugin_la_LIBADD += -ldwrite
 endif
 EXTRA_LTLIBRARIES += liblibass_plugin.la
-codec_LTLIBRARIES += $(LTLIBlibass)
+codec_PLUGINS += $(LTLIBlibass)
 
 libcc_plugin_la_SOURCES = codec/cc.c codec/cc.h codec/substext.h \
                           codec/cea708.h codec/cea708.c
-codec_LTLIBRARIES += libcc_plugin.la
+codec_PLUGINS += libcc_plugin.la
 
 libcvdsub_plugin_la_SOURCES = codec/cvdsub.c demux/mpeg/timestamps.h
-codec_LTLIBRARIES += libcvdsub_plugin.la
+codec_PLUGINS += libcvdsub_plugin.la
 
 libdvbsub_plugin_la_SOURCES = codec/dvbsub.c
-codec_LTLIBRARIES += libdvbsub_plugin.la
+codec_PLUGINS += libdvbsub_plugin.la
 
 libaribcaption_plugin_la_SOURCES = codec/arib/libaribcaption.c
 libaribcaption_plugin_la_CFLAGS = $(AM_CFLAGS) $(ARIBCAPTION_CFLAGS)
 libaribcaption_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libaribcaption_plugin_la_LIBADD = $(ARIBCAPTION_LIBS) $(LIBS_freetype) $(FREETYPE_LIBS)
 EXTRA_LTLIBRARIES += libaribcaption_plugin.la
-codec_LTLIBRARIES += $(LTLIBaribcaption)
+codec_PLUGINS += $(LTLIBaribcaption)
 
 libaribsub_plugin_la_SOURCES = codec/arib/aribsub.c codec/arib/substext.h
 libaribsub_plugin_la_CFLAGS = $(AM_CFLAGS) $(ARIBB24_CFLAGS)
 libaribsub_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libaribsub_plugin_la_LIBADD = $(ARIBB24_LIBS)
 EXTRA_LTLIBRARIES += libaribsub_plugin.la
-codec_LTLIBRARIES += $(LTLIBaribsub)
+codec_PLUGINS += $(LTLIBaribsub)
 
 libscte18_plugin_la_SOURCES = codec/scte18.c codec/scte18.h \
                               codec/atsc_a65.c codec/atsc_a65.h
-codec_LTLIBRARIES += libscte18_plugin.la
+codec_PLUGINS += libscte18_plugin.la
 
 libscte27_plugin_la_SOURCES = codec/scte27.c
-codec_LTLIBRARIES += libscte27_plugin.la
+codec_PLUGINS += libscte27_plugin.la
 
 libspudec_plugin_la_SOURCES = codec/spudec/spudec.c codec/spudec/parse.c codec/spudec/spudec.h
 libspudec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-codec_LTLIBRARIES += libspudec_plugin.la
+codec_PLUGINS += libspudec_plugin.la
 
 libstl_plugin_la_SOURCES = codec/stl.c
-codec_LTLIBRARIES += libstl_plugin.la
+codec_PLUGINS += libstl_plugin.la
 
 libsubsdec_plugin_la_SOURCES = codec/subsdec.c codec/substext.h
-codec_LTLIBRARIES += libsubsdec_plugin.la
+codec_PLUGINS += libsubsdec_plugin.la
 
 libsubsusf_plugin_la_SOURCES = codec/subsusf.c
-codec_LTLIBRARIES += libsubsusf_plugin.la
+codec_PLUGINS += libsubsusf_plugin.la
 
 libttml_plugin_la_SOURCES = codec/ttml/substtml.c \
                             demux/ttml.c \
                             codec/ttml/ttml.h codec/ttml/ttml.c \
                             codec/ttml/imageupdater.h \
                             codec/ttml/ttmlpes.h
-codec_LTLIBRARIES += libttml_plugin.la
+codec_PLUGINS += libttml_plugin.la
 
 libwebvtt_plugin_la_SOURCES = codec/webvtt/subsvtt.c \
                               codec/webvtt/webvtt.c \
@@ -237,7 +245,7 @@ libwebvtt_plugin_la_SOURCES = codec/webvtt/subsvtt.c \
 if ENABLE_SOUT
 libwebvtt_plugin_la_SOURCES += codec/webvtt/encvtt.c
 endif
-codec_LTLIBRARIES += libwebvtt_plugin.la
+codec_PLUGINS += libwebvtt_plugin.la
 if ENABLE_CSS
 # dependency: we need grammar build first
 BUILT_SOURCES += codec/webvtt/CSSGrammar.h
@@ -261,31 +269,31 @@ TESTS += css_parser_test
 endif
 
 libsvcdsub_plugin_la_SOURCES = codec/svcdsub.c demux/mpeg/timestamps.h
-codec_LTLIBRARIES += libsvcdsub_plugin.la
+codec_PLUGINS += libsvcdsub_plugin.la
 
 libt140_plugin_la_SOURCES = codec/t140.c
 if ENABLE_SOUT
-codec_LTLIBRARIES += libt140_plugin.la
+codec_PLUGINS += libt140_plugin.la
 endif
 
 libtelx_plugin_la_SOURCES = codec/telx.c
 libtelx_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 EXTRA_LTLIBRARIES += libtelx_plugin.la
-codec_LTLIBRARIES += $(LTLIBtelx)
+codec_PLUGINS += $(LTLIBtelx)
 
 libtextst_plugin_la_SOURCES = codec/textst.c demux/mpeg/timestamps.h
-codec_LTLIBRARIES += libtextst_plugin.la
 libtextst_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
+codec_PLUGINS += libtextst_plugin.la
 
 libzvbi_plugin_la_SOURCES = codec/zvbi.c
 libzvbi_plugin_la_CFLAGS = $(AM_CFLAGS) $(ZVBI_CFLAGS) $(CFLAGS_zvbi)
 libzvbi_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libzvbi_plugin_la_LIBADD = $(ZVBI_LIBS) $(SOCKET_LIBS)
 EXTRA_LTLIBRARIES += libzvbi_plugin.la
-codec_LTLIBRARIES += $(LTLIBzvbi)
+codec_PLUGINS += $(LTLIBzvbi)
 
 libsubstx3g_plugin_la_SOURCES = codec/substx3g.c codec/substext.h
-codec_LTLIBRARIES += libsubstx3g_plugin.la
+codec_PLUGINS += libsubstx3g_plugin.la
 
 ### Xiph ###
 
@@ -294,69 +302,69 @@ libflac_plugin_la_CFLAGS = $(AM_CFLAGS) $(FLAC_CFLAGS)
 libflac_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libflac_plugin_la_LIBADD = $(FLAC_LIBS)
 EXTRA_LTLIBRARIES += libflac_plugin.la
-codec_LTLIBRARIES += $(LTLIBflac)
+codec_PLUGINS += $(LTLIBflac)
 
 libkate_plugin_la_SOURCES = codec/kate.c
 libkate_plugin_la_CFLAGS = $(AM_CFLAGS) $(TIGER_CFLAGS) $(KATE_CFLAGS)
 libkate_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libkate_plugin_la_LIBADD = $(TIGER_LIBS) $(KATE_LIBS) $(LIBM)
 EXTRA_LTLIBRARIES += libkate_plugin.la
-codec_LTLIBRARIES += $(LTLIBkate)
+codec_PLUGINS += $(LTLIBkate)
 
 libopus_plugin_la_SOURCES = codec/opus.c codec/opus_header.c codec/opus_header.h
 libopus_plugin_la_CFLAGS = $(AM_CFLAGS) $(OPUS_CFLAGS)
 libopus_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libopus_plugin_la_LIBADD = $(OPUS_LIBS) $(LIBM)
 EXTRA_LTLIBRARIES += libopus_plugin.la
-codec_LTLIBRARIES += $(LTLIBopus)
+codec_PLUGINS += $(LTLIBopus)
 
 libspeex_plugin_la_SOURCES = codec/speex.c
 libspeex_plugin_la_CFLAGS = $(AM_CFLAGS) $(SPEEX_CFLAGS)
 libspeex_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libspeex_plugin_la_LIBADD = $(SPEEX_LIBS) $(LIBM)
 EXTRA_LTLIBRARIES += libspeex_plugin.la
-codec_LTLIBRARIES += $(LTLIBspeex)
+codec_PLUGINS += $(LTLIBspeex)
 
 libtheora_plugin_la_SOURCES = codec/theora.c
 libtheora_plugin_la_CFLAGS = $(AM_CFLAGS) $(THEORA_CFLAGS)
 libtheora_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libtheora_plugin_la_LIBADD = $(THEORA_LIBS)
 EXTRA_LTLIBRARIES += libtheora_plugin.la
-codec_LTLIBRARIES += $(LTLIBtheora)
+codec_PLUGINS += $(LTLIBtheora)
 
 libdaala_plugin_la_SOURCES = codec/daala.c
 libdaala_plugin_la_CFLAGS = $(AM_CFLAGS) $(DAALA_CFLAGS)
 libdaala_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libdaala_plugin_la_LIBADD = $(DAALA_LIBS)
 EXTRA_LTLIBRARIES += libdaala_plugin.la
-codec_LTLIBRARIES += $(LTLIBdaala)
+codec_PLUGINS += $(LTLIBdaala)
 
 libtremor_plugin_la_SOURCES = codec/vorbis.c
 libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_TREMOR
 libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libtremor_plugin_la_LIBADD = -lvorbisdec -logg
 EXTRA_LTLIBRARIES += libtremor_plugin.la
-codec_LTLIBRARIES += $(LTLIBtremor)
+codec_PLUGINS += $(LTLIBtremor)
 
 libvorbis_plugin_la_SOURCES = codec/vorbis.c
 libvorbis_plugin_la_CFLAGS = $(AM_CFLAGS) $(VORBIS_CFLAGS)
 libvorbis_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libvorbis_plugin_la_LIBADD = $(VORBIS_LIBS)
 EXTRA_LTLIBRARIES += libvorbis_plugin.la
-codec_LTLIBRARIES += $(LTLIBvorbis)
+codec_PLUGINS += $(LTLIBvorbis)
 
 liboggspots_plugin_la_SOURCES = codec/oggspots.c
 liboggspots_plugin_la_CFLAGS = $(AM_CFLAGS) $(OGGSPOTS_CFLAGS)
 liboggspots_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 liboggspots_plugin_la_LIBADD = $(OGGSPOTS_LIBS)
 EXTRA_LTLIBRARIES += liboggspots_plugin.la
-codec_LTLIBRARIES += $(LTLIBoggspots)
+codec_PLUGINS += $(LTLIBoggspots)
 
 libvideotoolbox_plugin_la_SOURCES = codec/videotoolbox.c
 libvideotoolbox_plugin_la_LIBADD = libchroma_copy.la libvlc_hxxxhelper.la libvlc_vtutils.la
 libvideotoolbox_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,CoreFoundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo
 if HAVE_DARWIN
-codec_LTLIBRARIES += libvideotoolbox_plugin.la
+codec_PLUGINS += libvideotoolbox_plugin.la
 endif
 
 ### FFmpeg/libav ###
@@ -393,7 +401,7 @@ libavcodec_plugin_la_LDFLAGS += -Wl,-framework,Foundation -Wl,-framework,Securit
 endif
 if HAVE_AVCODEC
 noinst_LTLIBRARIES += libavcodec_common.la
-codec_LTLIBRARIES += libavcodec_plugin.la
+codec_PLUGINS += libavcodec_plugin.la
 endif
 
 ### avcodec hardware acceleration ###
@@ -406,7 +414,7 @@ libvaapi_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVCODEC_CFLAGS)
 libvaapi_plugin_la_LIBADD = $(LIBVA_LIBS) $(AVCODEC_LIBS)
 if HAVE_AVCODEC
 if HAVE_VAAPI
-codec_LTLIBRARIES += libvaapi_plugin.la
+codec_PLUGINS += libvaapi_plugin.la
 endif
 endif
 
@@ -426,7 +434,7 @@ libdxva2_plugin_la_SOURCES = \
 libdxva2_plugin_la_LIBADD = libd3d9_common.la $(LIBCOM) -luuid
 if !HAVE_WINSTORE
 if HAVE_AVCODEC_DXVA2
-codec_LTLIBRARIES += libdxva2_plugin.la
+codec_PLUGINS += libdxva2_plugin.la
 endif
 endif
 
@@ -448,7 +456,7 @@ if HAVE_WINSTORE
 libd3d11va_plugin_la_LIBADD += -ld3d11
 endif
 if HAVE_AVCODEC_D3D11VA
-codec_LTLIBRARIES += libd3d11va_plugin.la
+codec_PLUGINS += libd3d11va_plugin.la
 endif
 
 ### OpenMAX ###
@@ -480,10 +488,10 @@ libmediacodec_plugin_la_SOURCES = codec/omxil/mediacodec.c codec/omxil/mediacode
 	codec/omxil/mediacodec_jni.c codec/omxil/mediacodec_ndk.c codec/omxil/utils.c \
 	codec/omxil/omxil_utils.h codec/omxil/qcom.c codec/omxil/qcom.h
 libmediacodec_plugin_la_LIBADD = libchroma_copy.la libvlc_hxxxhelper.la libandroid_utils.la $(LIBDL)
-codec_LTLIBRARIES += $(LTLIBomxil)
+codec_PLUGINS += $(LTLIBomxil)
 EXTRA_LTLIBRARIES += libomxil_plugin.la
 if HAVE_ANDROID
-codec_LTLIBRARIES += libmediacodec_plugin.la
+codec_PLUGINS += libmediacodec_plugin.la
 endif
 
 
@@ -495,7 +503,7 @@ libx265_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x265)
 libx265_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x265) $(codec_RPATH)
 libx265_plugin_la_LIBADD = $(LIBS_x265)
 EXTRA_LTLIBRARIES += libx265_plugin.la
-codec_LTLIBRARIES += $(LTLIBx265)
+codec_PLUGINS += $(LTLIBx265)
 
 libx262_plugin_la_SOURCES = codec/x264.c
 libx262_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_X262
@@ -503,7 +511,7 @@ libx262_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x262)
 libx262_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x262) $(codec_RPATH)
 libx262_plugin_la_LIBADD = $(LIBS_x262) $(LIBM)
 EXTRA_LTLIBRARIES += libx262_plugin.la
-codec_LTLIBRARIES += $(LTLIBx262)
+codec_PLUGINS += $(LTLIBx262)
 
 libx264_plugin_la_SOURCES = codec/x264.c
 libx264_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CPPFLAGS_x264) -DPLUGIN_X264
@@ -511,7 +519,7 @@ libx264_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x264)
 libx264_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x264) $(codec_RPATH)
 libx264_plugin_la_LIBADD = $(LIBS_x264) $(LIBM)
 EXTRA_LTLIBRARIES += libx264_plugin.la
-codec_LTLIBRARIES += $(LTLIBx264)
+codec_PLUGINS += $(LTLIBx264)
 
 libx26410b_plugin_la_SOURCES = codec/x264.c
 libx26410b_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_X264_10B
@@ -519,7 +527,7 @@ libx26410b_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_x26410b)
 libx26410b_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_x26410b) $(codec_RPATH)
 libx26410b_plugin_la_LIBADD = $(LIBS_x26410b) $(LIBM)
 EXTRA_LTLIBRARIES += libx26410b_plugin.la
-codec_LTLIBRARIES += $(LTLIBx26410b)
+codec_PLUGINS += $(LTLIBx26410b)
 
 
 ### Misc encoders ###
@@ -529,13 +537,13 @@ libfdkaac_plugin_la_CFLAGS = $(AM_CFLAGS) $(FDKAAC_CFLAGS)
 libfdkaac_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libfdkaac_plugin_la_LIBADD = $(FDKAAC_LIBS)
 EXTRA_LTLIBRARIES += libfdkaac_plugin.la
-codec_LTLIBRARIES += $(LTLIBfdkaac)
+codec_PLUGINS += $(LTLIBfdkaac)
 
 libshine_plugin_la_SOURCES = codec/shine.c
 libshine_plugin_la_CFLAGS = $(AM_CFLAGS) $(SHINE_CFLAGS)
 libshine_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH) $(SHINE_LIBS)
 EXTRA_LTLIBRARIES += libshine_plugin.la
-codec_LTLIBRARIES += $(LTLIBshine)
+codec_PLUGINS += $(LTLIBshine)
 
 libvpx_plugin_la_SOURCES = codec/vpx.c
 libvpx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
@@ -543,7 +551,7 @@ libvpx_plugin_la_CFLAGS = $(AM_CFLAGS) $(VPX_CFLAGS) $(CPPFLAGS_vpx)
 libvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libvpx_plugin_la_LIBADD = $(VPX_LIBS)
 EXTRA_LTLIBRARIES += libvpx_plugin.la
-codec_LTLIBRARIES += $(LTLIBvpx)
+codec_PLUGINS += $(LTLIBvpx)
 
 libaom_plugin_la_SOURCES = codec/aom.c \
                            packetizer/iso_color_tables.h
@@ -552,7 +560,7 @@ libaom_plugin_la_CFLAGS = $(AM_CFLAGS) $(AOM_CFLAGS) $(CPPFLAGS_aom)
 libaom_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libaom_plugin_la_LIBADD = $(AOM_LIBS)
 EXTRA_LTLIBRARIES += libaom_plugin.la
-codec_LTLIBRARIES += $(LTLIBaom)
+codec_PLUGINS += $(LTLIBaom)
 
 librav1e_plugin_la_SOURCES = codec/rav1e.c
 librav1e_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
@@ -560,7 +568,7 @@ librav1e_plugin_la_CFLAGS = $(AM_CFLAGS) $(RAV1E_CFLAGS)
 librav1e_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 librav1e_plugin_la_LIBADD = $(RAV1E_LIBS)
 EXTRA_LTLIBRARIES += librav1e_plugin.la
-codec_LTLIBRARIES += $(LTLIBrav1e)
+codec_PLUGINS += $(LTLIBrav1e)
 
 libtwolame_plugin_la_SOURCES = codec/twolame.c
 libtwolame_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DLIBTWOLAME_STATIC
@@ -568,7 +576,7 @@ libtwolame_plugin_la_CFLAGS = $(AM_CFLAGS) $(TWOLAME_CFLAGS)
 libtwolame_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libtwolame_plugin_la_LIBADD = $(TWOLAME_LIBS) $(LIBM)
 EXTRA_LTLIBRARIES += libtwolame_plugin.la
-codec_LTLIBRARIES += $(LTLIBtwolame)
+codec_PLUGINS += $(LTLIBtwolame)
 
 libdav1d_plugin_la_SOURCES = codec/dav1d.c \
 	packetizer/av1_obu.c packetizer/av1_obu.h
@@ -576,7 +584,7 @@ libdav1d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DAV1D_CFLAGS)
 libdav1d_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libdav1d_plugin_la_LIBADD = $(DAV1D_LIBS)
 EXTRA_LTLIBRARIES += libdav1d_plugin.la
-codec_LTLIBRARIES += $(LTLIBdav1d)
+codec_PLUGINS += $(LTLIBdav1d)
 
 
 ### Hardware encoders ###
@@ -586,7 +594,7 @@ libqsv_plugin_la_CFLAGS = $(AM_CFLAGS) $(MFX_CFLAGS)
 libqsv_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(codec_RPATH)
 libqsv_plugin_la_LIBADD = $(MFX_LIBS)
 EXTRA_LTLIBRARIES += libqsv_plugin.la
-codec_LTLIBRARIES += $(LTLIBqsv)
+codec_PLUGINS += $(LTLIBqsv)
 
 ### External frameworks ###
 
@@ -595,7 +603,7 @@ libdmo_plugin_la_LIBADD = $(LIBM)
 if HAVE_WIN32
 libdmo_plugin_la_LIBADD += $(LIBCOM) -luuid
 if !HAVE_WINSTORE
-codec_LTLIBRARIES += libdmo_plugin.la
+codec_PLUGINS += libdmo_plugin.la
 endif
 endif
 
@@ -603,7 +611,7 @@ libmft_plugin_la_SOURCES = codec/mft.cpp
 libmft_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(LIBCOMCXXFLAGS)
 if HAVE_WIN32
 libmft_plugin_la_LIBADD = $(LIBCOM) -luuid -lmfuuid -lmfplat libvlc_hxxxhelper.la libd3d11_common.la
-codec_LTLIBRARIES += libmft_plugin.la
+codec_PLUGINS += libmft_plugin.la
 if HAVE_WINSTORE
 libmft_plugin_la_LIBADD += -ld3d11
 endif
@@ -620,7 +628,7 @@ libgstdecode_plugin_la_SOURCES = codec/gstreamer/gstdecode.c \
 libgstdecode_plugin_la_CFLAGS = $(AM_CFLAGS) $(GST_VIDEO_CFLAGS) $(GST_APP_CFLAGS)
 libgstdecode_plugin_la_LIBADD = $(GST_VIDEO_LIBS) $(GST_APP_LIBS)
 if HAVE_GST_DECODE
-codec_LTLIBRARIES += libgstdecode_plugin.la
+codec_PLUGINS += libgstdecode_plugin.la
 endif
 
 libvlc_hxxxhelper_la_SOURCES = \

modules/control/Makefile.am

@@ -1,4 +1,11 @@
 controldir = $(pluginsdir)/control
+control_PLUGINS =
+control_LTLIBRARIES =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(control_PLUGINS)
+else
+control_LTLIBRARIES += $(control_PLUGINS)
+endif
 
 libdummy_plugin_la_SOURCES = control/dummy.c control/intromsg.h
 libgestures_plugin_la_SOURCES = control/gestures.c
@@ -14,7 +21,7 @@ librc_plugin_la_SOURCES = \
 	control/cli/cli.c control/cli/cli.h
 librc_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBM)
 
-control_LTLIBRARIES = \
+control_PLUGINS += \
 	libdummy_plugin.la \
 	libgestures_plugin.la \
 	libhotkeys_plugin.la \
@@ -23,7 +30,7 @@ control_LTLIBRARIES = \
 liblirc_plugin_la_SOURCES = control/lirc.c
 liblirc_plugin_la_LIBADD = -llirc_client
 if HAVE_LIRC
-control_LTLIBRARIES += liblirc_plugin.la
+control_PLUGINS += liblirc_plugin.la
 endif
 
 libvlc_motion_la_SOURCES = control/motionlib.c control/motionlib.h
@@ -43,7 +50,7 @@ libdbus_plugin_la_SOURCES = \
 libdbus_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 libdbus_plugin_la_LIBADD = $(DBUS_LIBS) $(LIBM)
 if HAVE_DBUS
-control_LTLIBRARIES += libdbus_plugin.la
+control_PLUGINS += libdbus_plugin.la
 endif
 
 libxcb_hotkeys_plugin_la_SOURCES = control/globalhotkeys/xcb.c
@@ -51,13 +58,13 @@ libxcb_hotkeys_plugin_la_CFLAGS = $(AM_CFLAGS) \
 	$(XCB_KEYSYMS_CFLAGS) $(XCB_CFLAGS)
 libxcb_hotkeys_plugin_la_LIBADD = $(XCB_KEYSYMS_LIBS) $(XCB_LIBS)
 if HAVE_XCB_KEYSYMS
-control_LTLIBRARIES += libxcb_hotkeys_plugin.la
+control_PLUGINS += libxcb_hotkeys_plugin.la
 endif
 
 libntservice_plugin_la_SOURCES = control/ntservice.c
 libwin_hotkeys_plugin_la_SOURCES = control/globalhotkeys/win32.c
 libwin_msg_plugin_la_SOURCES = control/win_msg.c
 if HAVE_WIN32_DESKTOP
-control_LTLIBRARIES += libntservice_plugin.la
-control_LTLIBRARIES += libwin_hotkeys_plugin.la libwin_msg_plugin.la
+control_PLUGINS += libntservice_plugin.la
+control_PLUGINS += libwin_hotkeys_plugin.la libwin_msg_plugin.la
 endif

modules/demux/Makefile.am

@@ -1,7 +1,13 @@
 demuxdir = $(pluginsdir)/demux
+demux_PLUGINS =
 demux_LTLIBRARIES =
 demux_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(demux_PLUGINS)
+else
+demux_LTLIBRARIES += $(demux_PLUGINS)
 demux_RPATH += -rpath '$(demuxdir)'
+endif
 
 libxiph_metadata_la_SOURCES = demux/xiph_metadata.h demux/xiph_metadata.c
 libxiph_metadata_la_LDFLAGS = -static
@@ -10,7 +16,7 @@ noinst_LTLIBRARIES += libxiph_metadata.la
 libflacsys_plugin_la_SOURCES = demux/flac.c packetizer/flac.h
 libflacsys_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libflacsys_plugin_la_LIBADD = libxiph_metadata.la
-demux_LTLIBRARIES += libflacsys_plugin.la
+demux_PLUGINS += libflacsys_plugin.la
 
 libogg_plugin_la_SOURCES = demux/ogg.c demux/ogg.h \
                            demux/oggseek.c demux/oggseek.h \
@@ -20,132 +26,132 @@ libogg_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBVORBIS_CFLAGS) $(OGG_CFLAGS)
 libogg_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(demux_RPATH)
 libogg_plugin_la_LIBADD = $(LIBVORBIS_LIBS) $(OGG_LIBS) $(LIBM) libxiph_metadata.la
 EXTRA_LTLIBRARIES += libogg_plugin.la
-demux_LTLIBRARIES += $(LTLIBogg)
+demux_PLUGINS += $(LTLIBogg)
 
 xiph_test_SOURCES = demux/xiph_test.c demux/xiph.h
 check_PROGRAMS += xiph_test
 TESTS += xiph_test
 
 libdemuxdump_plugin_la_SOURCES = demux/demuxdump.c
-demux_LTLIBRARIES += libdemuxdump_plugin.la
+demux_PLUGINS += libdemuxdump_plugin.la
 
 librawdv_plugin_la_SOURCES = demux/rawdv.c demux/rawdv.h
-demux_LTLIBRARIES += librawdv_plugin.la
+demux_PLUGINS += librawdv_plugin.la
 
 librawvid_plugin_la_SOURCES = demux/rawvid.c
-demux_LTLIBRARIES += librawvid_plugin.la
+demux_PLUGINS += librawvid_plugin.la
 
 libau_plugin_la_SOURCES = demux/au.c
-demux_LTLIBRARIES += libau_plugin.la
+demux_PLUGINS += libau_plugin.la
 
 librawaud_plugin_la_SOURCES = demux/rawaud.c
-demux_LTLIBRARIES += librawaud_plugin.la
+demux_PLUGINS += librawaud_plugin.la
 
 libwav_plugin_la_SOURCES = demux/wav.c demux/windows_audio_commons.h
-demux_LTLIBRARIES += libwav_plugin.la
+demux_PLUGINS += libwav_plugin.la
 
 libnsv_plugin_la_SOURCES = demux/nsv.c
-demux_LTLIBRARIES += libnsv_plugin.la
+demux_PLUGINS += libnsv_plugin.la
 
 libhx_plugin_la_SOURCES = demux/hx.c
-demux_LTLIBRARIES += libhx_plugin.la
+demux_PLUGINS += libhx_plugin.la
 
 libps_plugin_la_SOURCES = demux/mpeg/ps.c demux/mpeg/ps.h demux/mpeg/pes.h
-demux_LTLIBRARIES += libps_plugin.la
+demux_PLUGINS += libps_plugin.la
 
 libmod_plugin_la_SOURCES = demux/mod.c
 libmod_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_mod)
 libmod_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(demux_RPATH)
 libmod_plugin_la_LIBADD = $(LIBS_mod)
 EXTRA_LTLIBRARIES += libmod_plugin.la
-demux_LTLIBRARIES += $(LTLIBmod)
+demux_PLUGINS += $(LTLIBmod)
 
 libpva_plugin_la_SOURCES = demux/pva.c demux/mpeg/pes.h demux/mpeg/timestamps.h
-demux_LTLIBRARIES += libpva_plugin.la
+demux_PLUGINS += libpva_plugin.la
 
 libaiff_plugin_la_SOURCES = demux/aiff.c demux/mp4/coreaudio.h
-demux_LTLIBRARIES += libaiff_plugin.la
+demux_PLUGINS += libaiff_plugin.la
 
 libmjpeg_plugin_la_SOURCES = demux/mjpeg.c demux/mxpeg_helper.h
-demux_LTLIBRARIES += libmjpeg_plugin.la
+demux_PLUGINS += libmjpeg_plugin.la
 
 libsubtitle_plugin_la_SOURCES = demux/subtitle.c
 libsubtitle_plugin_la_LIBADD = $(LIBM)
-demux_LTLIBRARIES += libsubtitle_plugin.la
+demux_PLUGINS += libsubtitle_plugin.la
 
 libty_plugin_la_SOURCES = demux/ty.c codec/cc.h \
                           demux/mpeg/pes.h demux/mpeg/timestamps.h
-demux_LTLIBRARIES += libty_plugin.la
+demux_PLUGINS += libty_plugin.la
 
 libvobsub_plugin_la_SOURCES = demux/vobsub.c demux/vobsub.h \
                               demux/mpeg/ps.h demux/mpeg/pes.h \
                               demux/subtitle_helper.h
-demux_LTLIBRARIES += libvobsub_plugin.la
+demux_PLUGINS += libvobsub_plugin.la
 
 libvoc_plugin_la_SOURCES = demux/voc.c
-demux_LTLIBRARIES += libvoc_plugin.la
+demux_PLUGINS += libvoc_plugin.la
 
 libxa_plugin_la_SOURCES = demux/xa.c
-demux_LTLIBRARIES += libxa_plugin.la
+demux_PLUGINS += libxa_plugin.la
 
 libnuv_plugin_la_SOURCES = demux/nuv.c
 libnuv_plugin_la_LIBADD = $(LIBM)
-demux_LTLIBRARIES += libnuv_plugin.la
+demux_PLUGINS += libnuv_plugin.la
 
 libmpc_plugin_la_SOURCES = demux/mpc.c
 libmpc_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(demux_RPATH)
 libmpc_plugin_la_LIBADD = $(LIBS_mpc) $(LIBM)
 EXTRA_LTLIBRARIES += libmpc_plugin.la
-demux_LTLIBRARIES += $(LTLIBmpc)
+demux_PLUGINS += $(LTLIBmpc)
 
 libtta_plugin_la_SOURCES = demux/tta.c
-demux_LTLIBRARIES += libtta_plugin.la
+demux_PLUGINS += libtta_plugin.la
 
 libvc1_plugin_la_SOURCES = demux/vc1.c
-demux_LTLIBRARIES += libvc1_plugin.la
+demux_PLUGINS += libvc1_plugin.la
 
 libdemux_cdg_plugin_la_SOURCES = demux/cdg.c
 libdemux_cdg_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-demux_LTLIBRARIES += libdemux_cdg_plugin.la
+demux_PLUGINS += libdemux_cdg_plugin.la
 
 libsmf_plugin_la_SOURCES = demux/smf.c
-demux_LTLIBRARIES += libsmf_plugin.la
+demux_PLUGINS += libsmf_plugin.la
 
 libdmxmus_plugin_la_SOURCES = demux/dmxmus.c
-demux_LTLIBRARIES += libdmxmus_plugin.la
+demux_PLUGINS += libdmxmus_plugin.la
 
 libgme_plugin_la_SOURCES = demux/gme.c
 libgme_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(demux_RPATH)
 libgme_plugin_la_LIBADD = $(LIBS_gme)
 EXTRA_LTLIBRARIES += libgme_plugin.la
-demux_LTLIBRARIES += $(LTLIBgme)
+demux_PLUGINS += $(LTLIBgme)
 
 libsid_plugin_la_SOURCES = demux/sid.cpp
 libsid_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_sid)
 libsid_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(demux_RPATH)
 libsid_plugin_la_LIBADD = $(LIBS_sid)
 EXTRA_LTLIBRARIES += libsid_plugin.la
-demux_LTLIBRARIES += $(LTLIBsid)
+demux_PLUGINS += $(LTLIBsid)
 
 libimage_plugin_la_SOURCES = demux/image.c demux/mxpeg_helper.h
-demux_LTLIBRARIES += libimage_plugin.la
+demux_PLUGINS += libimage_plugin.la
 
 libdemux_stl_plugin_la_SOURCES = demux/stl.c
 libdemux_stl_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-demux_LTLIBRARIES += libdemux_stl_plugin.la
+demux_PLUGINS += libdemux_stl_plugin.la
 
 libasf_plugin_la_SOURCES = demux/asf/asf.c demux/asf/libasf.c demux/asf/libasf.h \
                            demux/asf/asfpacket.c demux/asf/asfpacket.h \
                            demux/asf/libasf_guid.h
-demux_LTLIBRARIES += libasf_plugin.la
+demux_PLUGINS += libasf_plugin.la
 
 libavi_plugin_la_SOURCES = demux/avi/avi.c demux/avi/libavi.c demux/avi/libavi.h \
                            demux/avi/bitmapinfoheader.h
-demux_LTLIBRARIES += libavi_plugin.la
+demux_PLUGINS += libavi_plugin.la
 
 libcaf_plugin_la_SOURCES = demux/caf.c
 libcaf_plugin_la_LIBADD = $(LIBM)
-demux_LTLIBRARIES += libcaf_plugin.la
+demux_PLUGINS += libcaf_plugin.la
 
 libavformat_plugin_la_SOURCES = demux/avformat/demux.c \
 	demux/vobsub.h \
@@ -158,24 +164,24 @@ libavformat_plugin_la_LIBADD = $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM) $(LIBZ) l
 libavformat_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS)
 if HAVE_AVFORMAT
 if !MERGE_FFMPEG
-demux_LTLIBRARIES += libavformat_plugin.la
+demux_PLUGINS += libavformat_plugin.la
 noinst_LTLIBRARIES += libavcodec_common.la
 endif
 endif
 
 libdirectory_demux_plugin_la_SOURCES = demux/directory.c
-demux_LTLIBRARIES += libdirectory_demux_plugin.la
+demux_PLUGINS += libdirectory_demux_plugin.la
 
 libes_plugin_la_SOURCES  = demux/mpeg/es.c \
                            meta_engine/ID3Tag.h \
                            meta_engine/ID3Text.h \
                            packetizer/dts_header.c packetizer/dts_header.h
-demux_LTLIBRARIES += libes_plugin.la
+demux_PLUGINS += libes_plugin.la
 
 libh26x_plugin_la_SOURCES = demux/mpeg/h26x.c \
                             packetizer/h264_nal.c packetizer/hevc_nal.h
 libh26x_plugin_la_LIBADD = $(LIBM)
-demux_LTLIBRARIES += libh26x_plugin.la
+demux_PLUGINS += libh26x_plugin.la
 
 libmkv_plugin_la_SOURCES = \
 	demux/mkv/util.hpp demux/mkv/util.cpp \
@@ -201,7 +207,7 @@ libmkv_plugin_la_SOURCES += packetizer/dts_header.h packetizer/dts_header.c
 libmkv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_mkv)
 libmkv_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(demux_RPATH)
 libmkv_plugin_la_LIBADD = $(LIBS_mkv) $(LIBZ) libvlc_mp4.la
-demux_LTLIBRARIES += $(LTLIBmkv)
+demux_PLUGINS += $(LTLIBmkv)
 EXTRA_LTLIBRARIES += libmkv_plugin.la
 
 libvlc_mp4_la_SOURCES = demux/mp4/libmp4.c demux/mp4/libmp4.h
@@ -226,10 +232,10 @@ libmp4_plugin_la_SOURCES = demux/mp4/mp4.c demux/mp4/mp4.h \
                            meta_engine/ID3Genres.h
 libmp4_plugin_la_LIBADD = libvlc_mp4.la
 libmp4_plugin_la_LDFLAGS = $(AM_LDFLAGS)
-demux_LTLIBRARIES += libmp4_plugin.la
+demux_PLUGINS += libmp4_plugin.la
 
 libmpgv_plugin_la_SOURCES = demux/mpeg/mpgv.c
-demux_LTLIBRARIES += libmpgv_plugin.la
+demux_PLUGINS += libmpgv_plugin.la
 
 libplaylist_plugin_la_SOURCES = \
 	demux/playlist/asx.c \
@@ -249,7 +255,7 @@ libplaylist_plugin_la_SOURCES = \
 	demux/playlist/wpl.c \
 	demux/playlist/xspf.c \
 	demux/playlist/playlist.c demux/playlist/playlist.h
-demux_LTLIBRARIES += libplaylist_plugin.la
+demux_PLUGINS += libplaylist_plugin.la
 
 libts_plugin_la_SOURCES = demux/mpeg/ts.c demux/mpeg/ts.h \
         demux/mpeg/ts_pid.h demux/mpeg/ts_pid_fwd.h demux/mpeg/ts_pid.c \
@@ -290,7 +296,7 @@ libts_plugin_la_CFLAGS += $(ARIBB24_CFLAGS)
 libts_plugin_la_LIBADD += $(ARIBB24_LIBS)
 endif
 if HAVE_DVBPSI
-demux_LTLIBRARIES += libts_plugin.la
+demux_PLUGINS += libts_plugin.la
 endif
 
 libvlc_adaptive_la_SOURCES = \
@@ -498,7 +504,7 @@ noinst_LTLIBRARIES += libvlc_adaptive.la
 libadaptive_plugin_la_SOURCES = demux/adaptive/adaptive.cpp
 libadaptive_plugin_la_CXXFLAGS = $(libvlc_adaptive_la_CXXFLAGS)
 libadaptive_plugin_la_LIBADD = libvlc_adaptive.la
-demux_LTLIBRARIES += libadaptive_plugin.la
+demux_PLUGINS += libadaptive_plugin.la
 
 adaptive_test_SOURCES = \
     demux/adaptive/test/logic/BufferingLogic.cpp \
@@ -524,13 +530,13 @@ libytdl_plugin_la_LIBADD = libvlc_json.la
 if !HAVE_WIN32
 if !HAVE_ANDROID
 if !HAVE_EMSCRIPTEN
-demux_LTLIBRARIES += libytdl_plugin.la
+demux_PLUGINS += libytdl_plugin.la
 endif
 endif
 endif
 
 libnoseek_plugin_la_SOURCES = demux/filter/noseek.c
-demux_LTLIBRARIES += libnoseek_plugin.la
+demux_PLUGINS += libnoseek_plugin.la
 
 libdemux_mock_plugin_la_SOURCES = demux/mock.c
 libdemux_mock_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(demux_RPATH)

modules/gui/Makefile.am

@@ -1,13 +1,20 @@
 guidir = $(pluginsdir)/gui
 gui_LTLIBRARIES =
+gui_PLUGINS =
 gui_RPATH =
+
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(gui_PLUGINS)
+else
+gui_LTLIBRARIES += $(gui_PLUGINS)
 gui_RPATH += -rpath '$(guidir)'
+endif
 
 libncurses_plugin_la_SOURCES = gui/ncurses.c
 libncurses_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(NCURSES_CFLAGS)
 libncurses_plugin_la_LIBADD = $(NCURSES_LIBS) $(LIBM)
 if HAVE_NCURSES
-gui_LTLIBRARIES += libncurses_plugin.la
+gui_PLUGINS += libncurses_plugin.la
 endif
 
 EXTRA_DIST += gui/eject.c
@@ -20,7 +27,7 @@ libminimal_macosx_plugin_la_SOURCES = \
 libminimal_macosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc -fobjc-exceptions
 libminimal_macosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(gui_RPATH) -Wl,-framework,Cocoa
 EXTRA_LTLIBRARIES += libminimal_macosx_plugin.la
-gui_LTLIBRARIES += $(LTLIBminimal_macosx)
+gui_PLUGINS += $(LTLIBminimal_macosx)
 
 include gui/macosx/Makefile.am
 include gui/qt/Makefile.am

modules/gui/macosx/Makefile.am

@@ -357,7 +357,7 @@ libmacosx_plugin_la_XIB_SOURCES = \
 libmacosx_plugin_la_SOURCES += $(libmacosx_plugin_la_XIB_SOURCES)
 
 if ENABLE_MACOSX_UI
-gui_LTLIBRARIES += libmacosx_plugin.la
+gui_PLUGINS += libmacosx_plugin.la
 BUILT_SOURCES += $(libmacosx_plugin_la_XIB_SOURCES:.xib=.nib)
 endif
 

modules/gui/qt/Makefile.am

@@ -1112,7 +1112,7 @@ endif
 endif
 
 if ENABLE_QT
-gui_LTLIBRARIES += libqt_plugin.la
+gui_PLUGINS += libqt_plugin.la
 BUILT_SOURCES += $(nodist_libqt_plugin_la_SOURCES)
 if !HAVE_WIN32
 if !HAVE_OS2

modules/gui/skins2/Makefile.am

@@ -264,5 +264,5 @@ libskins2_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) -O2 -fno-rtti
 libskins2_plugin_la_LIBADD = $(LIBS_skins2)
 
 if BUILD_SKINS
-gui_LTLIBRARIES += libskins2_plugin.la
+gui_PLUGINS += libskins2_plugin.la
 endif

modules/hw/d3d11/Makefile.am

@@ -1,6 +1,13 @@
 d3d11dir = $(pluginsdir)/d3d11
+d3d11_LTLIBRARIES =
+d3d11_PLUGINS =
 d3d11_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(d3d11_PLUGINS)
+else
+d3d11_LTLIBRARIES += $(d3d11_PLUGINS)
 d3d11_RPATH += -rpath '$(d3d11dir)'
+endif
 
 libdirect3d11_filters_plugin_la_SOURCES = hw/d3d11/d3d11_filters.h \
     hw/d3d11/d3d11_filters.c \
@@ -16,6 +23,5 @@ if HAVE_WINSTORE
 libdirect3d11_filters_plugin_la_LIBADD += -ld3d11
 endif
 
-d3d11_LTLIBRARIES = $(LTLIBdirect3d11_filters)
+d3d11_PLUGINS += $(LTLIBdirect3d11_filters)
 EXTRA_LTLIBRARIES += libdirect3d11_filters_plugin.la
-

modules/hw/d3d9/Makefile.am

@@ -1,6 +1,13 @@
 d3d9dir = $(pluginsdir)/d3d9
+d3d9_LTLIBRARIES =
+d3d9_PLUGINS =
 d3d9_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(d3d9_PLUGINS)
+else
+d3d9_LTLIBRARIES += $(d3d9_PLUGINS)
 d3d9_RPATH += -rpath '$(d3d9dir)'
+endif
 
 libdirect3d9_filters_plugin_la_SOURCES = hw/d3d9/d3d9_filters.h \
     hw/d3d9/d3d9_filters.c \
@@ -11,6 +18,6 @@ libdirect3d9_filters_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(d3d9_RPATH)
 libdirect3d9_filters_plugin_la_LIBADD = libchroma_copy.la libdeinterlace_common.la libd3d9_common.la $(LIBCOM)
 
 if HAVE_WIN32_DESKTOP
-d3d9_LTLIBRARIES = $(LTLIBdirect3d9_filters)
+d3d9_PLUGINS += $(LTLIBdirect3d9_filters)
 EXTRA_LTLIBRARIES += libdirect3d9_filters_plugin.la
 endif

modules/hw/mmal/Makefile.am

@@ -1,4 +1,12 @@
 mmaldir = $(pluginsdir)/mmal
+mmal_LTLIBRARIES =
+mmal_PLUGINS =
+
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(mmal_PLUGINS)
+else
+mmal_LTLIBRARIES += $(mmal_PLUGINS)
+endif
 
 libvlc_mmal_la_SOURCES = hw/mmal/subpic.c hw/mmal/subpic.h \
 	hw/mmal/mmal_picture.c hw/mmal/mmal_picture.h \
@@ -28,7 +36,7 @@ libmmal_device_plugin_la_LIBADD = libvlc_mmal.la
 
 if HAVE_MMAL
 noinst_LTLIBRARIES += libvlc_mmal.la
-mmal_LTLIBRARIES = \
+mmal_PLUGINS += \
 	libmmal_device_plugin.la \
 	libmmal_deinterlace_plugin.la \
 	libmmal_converter_plugin.la \

modules/hw/nvdec/Makefile.am

@@ -1,17 +1,24 @@
 nvdecdir = $(pluginsdir)/nvdec
 nvdec_LTLIBRARIES =
+nvdec_PLUGINS =
+
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(nvdec_PLUGINS)
+else
+nvdec_LTLIBRARIES += $(nvdec_PLUGINS)
+endif
 
 libnvdec_plugin_la_SOURCES = \
 	hw/nvdec/nvdec.c hw/nvdec/nvdec_fmt.h \
 	hw/nvdec/hw_pool.c hw/nvdec/hw_pool.h
 libnvdec_plugin_la_LIBADD = $(LIBDL) libvlc_hxxxhelper.la
 if HAVE_NVDEC
-nvdec_LTLIBRARIES += libnvdec_plugin.la
+nvdec_PLUGINS += libnvdec_plugin.la
 endif
 
 libnvdec_chroma_plugin_la_SOURCES = hw/nvdec/chroma.c hw/nvdec/nvdec_fmt.h
 if HAVE_NVDEC
-nvdec_LTLIBRARIES += libnvdec_chroma_plugin.la
+nvdec_PLUGINS += libnvdec_chroma_plugin.la
 endif
 
 libglinterop_nvdec_plugin_la_SOURCES = hw/nvdec/nvdec_gl.c \
@@ -19,6 +26,6 @@ libglinterop_nvdec_plugin_la_SOURCES = hw/nvdec/nvdec_gl.c \
 libglinterop_nvdec_plugin_la_LIBADD = $(LIBDL)
 if HAVE_GL
 if HAVE_NVDEC
-nvdec_LTLIBRARIES += libglinterop_nvdec_plugin.la
+codec_PLUGINS += libglinterop_nvdec_plugin.la
 endif
 endif

modules/hw/vaapi/Makefile.am

@@ -1,4 +1,11 @@
 vaapidir = $(pluginsdir)/vaapi
+vaapi_PLUGINS =
+vaapi_LTLIBRARIES =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(vaapi_PLUGINS)
+else
+vaapi_LTLIBRARIES += $(vaapi_PLUGINS)
+endif
 
 libdecdev_vaapi_wl_plugin_la_SOURCES = hw/vaapi/decoder_device.c \
 	hw/vaapi/vlc_vaapi.c hw/vaapi/vlc_vaapi.h
@@ -22,18 +29,18 @@ libvaapi_filters_plugin_la_CFLAGS = $(AM_CFLAGS) $(LIBVA_CFLAGS)
 libvaapi_filters_plugin_la_LIBADD = libchroma_copy.la $(AM_LIBADD) $(LIBVA_LIBS)
 
 if HAVE_VAAPI
-vaapi_LTLIBRARIES = libvaapi_filters_plugin.la
+vaapi_PLUGINS += libvaapi_filters_plugin.la
 if HAVE_WAYLAND
 if HAVE_VAAPI_WL
-vaapi_LTLIBRARIES += libdecdev_vaapi_wl_plugin.la
+vaapi_PLUGINS += libdecdev_vaapi_wl_plugin.la
 endif
 endif
 if HAVE_XCB
 if HAVE_VAAPI_X11
-vaapi_LTLIBRARIES += libdecdev_vaapi_x11_plugin.la
+vaapi_PLUGINS += libdecdev_vaapi_x11_plugin.la
 endif
 endif
 if HAVE_VAAPI_DRM
-vaapi_LTLIBRARIES += libdecdev_vaapi_drm_plugin.la
+vaapi_PLUGINS += libdecdev_vaapi_drm_plugin.la
 endif
 endif

modules/hw/vdpau/Makefile.am

@@ -1,4 +1,11 @@
 vdpaudir = $(pluginsdir)/vdpau
+vdpau_PLUGINS =
+vdpau_LTLIBRARIES =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(vdpau_PLUGINS)
+else
+vdpau_LTLIBRARIES += $(vdpau_PLUGINS)
+endif
 
 libvlc_vdpau_la_SOURCES = hw/vdpau/vlc_vdpau.c hw/vdpau/vlc_vdpau.h
 libvlc_vdpau_la_CFLAGS = $(VDPAU_CFLAGS)
@@ -36,10 +43,10 @@ libvdpau_chroma_plugin_la_LIBADD = libvlc_vdpau.la
 
 if HAVE_VDPAU
 pkglib_LTLIBRARIES += libvlc_vdpau.la
-vdpau_LTLIBRARIES = libvdpau_instance_plugin.la \
+vdpau_PLUGINS += libvdpau_instance_plugin.la \
 	libvdpau_deinterlace_plugin.la libvdpau_adjust_plugin.la \
 	libvdpau_sharpen_plugin.la libvdpau_chroma_plugin.la
 if HAVE_AVCODEC_VDPAU
-vdpau_LTLIBRARIES += libvdpau_avcodec_plugin.la
+vdpau_PLUGINS += libvdpau_avcodec_plugin.la
 endif
 endif

modules/isa/aarch64/Makefile.am

@@ -1,11 +1,20 @@
 aarch64dir = $(pluginsdir)/aarch64
 aarch64_LTLIBRARIES =
+aarch64_PLUGINS =
+aarch64_RPATH =
+
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(aarch64_PLUGINS)
+else
+aarch64_LTLIBRARIES += $(aarch64_PLUGINS)
+aarch64_RPATH += -rpath '$(aarch64dir)'
+endif
 
 libdeinterlace_aarch64_plugin_la_SOURCES = \
 	isa/aarch64/simd/deinterlace.c isa/aarch64/simd/merge.S
 
 if HAVE_ARM64
-aarch64_LTLIBRARIES += \
+aarch64_PLUGINS += \
 	libdeinterlace_aarch64_plugin.la
 endif
 
@@ -13,6 +22,6 @@ libdeinterlace_sve_plugin_la_SOURCES = \
 	isa/aarch64/sve/deinterlace.c isa/aarch64/sve/merge.S
 
 if HAVE_SVE
-aarch64_LTLIBRARIES += \
+aarch64_PLUGINS += \
 	libdeinterlace_sve_plugin.la
 endif

modules/isa/arm/Makefile.am

@@ -1,12 +1,29 @@
 armdir = $(pluginsdir)/arm
 neondir = $(pluginsdir)/arm_neon
 
+arm_LTLIBRARIES =
+arm_PLUGINS =
+arm_RPATH =
+
+neon_LTLIBRARIES =
+neon_PLUGINS =
+neon_RPATH =
+
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(arm_PLUGINS) $(neon_PLUGINS)
+else
+arm_LTLIBRARIES += $(arm_PLUGINS)
+neon_LTLIBRARIES += $(neon_PLUGINS)
+arm_RPATH += -rpath '$(armdir)'
+neon_RPATH += -rpath '$(neondir)'
+endif
+
 libdeinterlace_arm_simd_plugin_la_SOURCES = \
 	isa/arm/simd/deinterlace.c isa/arm/simd/merge.S
 
 # TODO? use dedicated conditional, or purge
 if HAVE_NEON
-arm_LTLIBRARIES = \
+arm_PLUGINS += \
 	libdeinterlace_arm_simd_plugin.la
 endif
 
@@ -33,7 +50,7 @@ libyuv_rgb_neon_plugin_la_SOURCES = \
 libyuv_rgb_neon_plugin_LIBTOOLFLAGS = --tag=CC
 
 if HAVE_NEON
-neon_LTLIBRARIES = \
+neon_PLUGINS += \
 	libchroma_yuv_neon_plugin.la \
 	libdeinterlace_neon_plugin.la \
 	libvolume_neon_plugin.la \

modules/isa/riscv/Makefile.am

@@ -1,4 +1,15 @@
 riscvdir = $(pluginsdir)/riscv
+riscv_LTLIBRARIES =
+riscv_PLUGINS =
+riscv_RPATH =
+
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(riscv_PLUGINS)
+else
+riscv_LTLIBRARIES += $(riscv_PLUGINS)
+riscv_RPATH += -rpath '$(riscvdir)'
+endif
+
 
 libdeinterlace_rvv_plugin_la_SOURCES = \
 	isa/riscv/deinterlace.c isa/riscv/rvv_merge.S
@@ -9,7 +20,7 @@ libvolume_rvv_plugin_la_SOURCES = isa/riscv/mixer.c isa/riscv/rvv_amplify.S
 libvolume_rvv_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
 
 if HAVE_RVV
-riscv_LTLIBRARIES = \
+riscv_PLUGINS += \
 	libdeinterlace_rvv_plugin.la \
 	libtransform_rvv_plugin.la \
 	libvolume_rvv_plugin.la

modules/keystore/Makefile.am

@@ -1,10 +1,17 @@
 keystoredir = $(pluginsdir)/keystore
+keystore_PLUGINS =
+keystore_LTLIBRARIES =
 keystore_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(keystore_PLUGINS)
+else
+keystore_LTLIBRARIES += $(keystore_PLUGINS)
 keystore_RPATH += -rpath '$(keystoredir)'
+endif
 
 libmemory_keystore_plugin_la_SOURCES = keystore/memory.c \
 	keystore/list_util.c keystore/list_util.h
-keystore_LTLIBRARIES = libmemory_keystore_plugin.la
+keystore_PLUGINS += libmemory_keystore_plugin.la
 
 libfile_keystore_plugin_la_SOURCES = keystore/file.c \
 	keystore/file_crypt.h \
@@ -17,7 +24,7 @@ if HAVE_WIN32
 libfile_keystore_plugin_la_SOURCES += keystore/file_crypt_win32.c
 libfile_keystore_plugin_la_LIBADD = -lcrypt32
 endif
-keystore_LTLIBRARIES += libfile_keystore_plugin.la
+keystore_PLUGINS += libfile_keystore_plugin.la
 
 libsecret_plugin_la_SOURCES = keystore/secret.c
 libsecret_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SECRET_CFLAGS)
@@ -34,10 +41,10 @@ libkeychain_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc
 libkeychain_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(keystore_RPATH) -Wl,-framework,Foundation -Wl,-framework,Security
 
 if HAVE_DARWIN
-keystore_LTLIBRARIES += libkeychain_plugin.la
+keystore_PLUGINS += libkeychain_plugin.la
 endif
 
-keystore_LTLIBRARIES += \
+keystore_PLUGINS += \
 	$(LTLIBsecret) \
 	$(LTLIBkwallet)
 

modules/logger/Makefile.am

@@ -1,32 +1,39 @@
 loggerdir = $(pluginsdir)/logger
+logger_PLUGINS =
+logger_LTLIBRARIES =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(logger_PLUGINS)
+else
+logger_LTLIBRARIES += $(logger_PLUGINS)
+endif
 
 libconsole_logger_plugin_la_SOURCES = logger/console.c
 libfile_logger_plugin_la_SOURCES = logger/file.c
-logger_LTLIBRARIES = libconsole_logger_plugin.la libfile_logger_plugin.la
+logger_PLUGINS += libconsole_logger_plugin.la libfile_logger_plugin.la
 
 libsyslog_plugin_la_SOURCES = logger/syslog.c
 if HAVE_SYSLOG
-logger_LTLIBRARIES += libsyslog_plugin.la
+logger_PLUGINS += libsyslog_plugin.la
 endif
 
 libsd_journal_plugin_la_SOURCES = logger/journal.c
 libsd_journal_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SYSTEMD_CFLAGS)
 libsd_journal_plugin_la_LIBADD = $(SYSTEMD_LIBS)
 if HAVE_SYSTEMD
-logger_LTLIBRARIES += libsd_journal_plugin.la
+logger_PLUGINS += libsd_journal_plugin.la
 endif
 
 libandroid_logger_plugin_la_SOURCES = logger/android.c
 libandroid_logger_plugin_la_LIBADD = -llog
 if HAVE_ANDROID
-logger_LTLIBRARIES += libandroid_logger_plugin.la
+logger_PLUGINS += libandroid_logger_plugin.la
 endif
 
 libjson_tracer_plugin_la_SOURCES = logger/json.c
-logger_LTLIBRARIES += libjson_tracer_plugin.la
+logger_PLUGINS += libjson_tracer_plugin.la
 
 libemscripten_logger_plugin_la_SOURCES = logger/emscripten.c
 
 if HAVE_EMSCRIPTEN
-logger_LTLIBRARIES += libemscripten_logger_plugin.la
+logger_PLUGINS += libemscripten_logger_plugin.la
 endif

modules/lua/Makefile.am

@@ -1,4 +1,11 @@
 luadir = $(pluginsdir)/lua
+lua_PLUGINS =
+lua_LTLIBRARIES =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(lua_PLUGINS)
+else
+lua_LTLIBRARIES += $(lua_PLUGINS)
+endif
 
 liblua_plugin_la_SOURCES = \
 	lua/extension.c lua/extension.h \
@@ -41,5 +48,5 @@ endif
 liblua_plugin_la_CFLAGS = $(AM_CFLAGS) $(LUA_CFLAGS) -I$(srcdir)/lua
 liblua_plugin_la_LIBADD = $(LUA_LIBS) $(SOCKET_LIBS) $(LIBDL) $(LIBM)
 if BUILD_LUA
-lua_LTLIBRARIES = liblua_plugin.la
+lua_PLUGINS += liblua_plugin.la
 endif

modules/meta_engine/Makefile.am

@@ -1,9 +1,16 @@
 metadir = $(pluginsdir)/meta_engine
+meta_PLUGINS =
+meta_LTLIBRARIES =
 meta_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(meta_PLUGINS)
+else
+meta_LTLIBRARIES += $(meta_PLUGINS)
 meta_RPATH += -rpath '$(metadir)'
+endif
 
 libfolder_plugin_la_SOURCES = meta_engine/folder.c
-meta_LTLIBRARIES = libfolder_plugin.la
+meta_PLUGINS += libfolder_plugin.la
 
 libtaglib_plugin_la_SOURCES = meta_engine/taglib.cpp \
 	demux/xiph_metadata.h demux/xiph_metadata.c
@@ -11,4 +18,4 @@ libtaglib_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(TAGLIB_CFLAGS)
 libtaglib_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(meta_RPATH)
 libtaglib_plugin_la_LIBADD = $(TAGLIB_LIBS) -lz
 EXTRA_LTLIBRARIES += libtaglib_plugin.la
-meta_LTLIBRARIES += $(LTLIBtaglib)
+meta_PLUGINS += $(LTLIBtaglib)

modules/misc/Makefile.am

@@ -1,21 +1,27 @@
 miscdir = $(pluginsdir)/misc
+misc_PLUGINS =
+misc_LTLIBRARIES =
 misc_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(misc_PLUGINS)
+else
+misc_LTLIBRARIES += $(misc_PLUGINS)
 misc_RPATH += -rpath '$(miscdir)'
+endif
 
 libstats_plugin_la_SOURCES = misc/stats.c
-
-misc_LTLIBRARIES = libstats_plugin.la
+misc_PLUGINS += libstats_plugin.la
 
 libaudioscrobbler_plugin_la_SOURCES = misc/audioscrobbler.c
 libaudioscrobbler_plugin_la_LIBADD = $(SOCKET_LIBS)
-misc_LTLIBRARIES += libaudioscrobbler_plugin.la
+misc_PLUGINS += libaudioscrobbler_plugin.la
 
 libexport_plugin_la_SOURCES = \
 	misc/playlist/html.c \
 	misc/playlist/m3u.c \
 	misc/playlist/xspf.c \
 	misc/playlist/export.c
-misc_LTLIBRARIES += libexport_plugin.la
+misc_PLUGINS += libexport_plugin.la
 
 libfingerprinter_plugin_la_SOURCES =  \
 	misc/webservices/acoustid.c misc/webservices/acoustid.h \
@@ -24,7 +30,7 @@ libfingerprinter_plugin_la_SOURCES =  \
 	misc/fingerprinter.c
 libfingerprinter_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/misc
 libfingerprinter_plugin_la_LIBADD = $(LIBM)
-misc_LTLIBRARIES += libfingerprinter_plugin.la
+misc_PLUGINS += libfingerprinter_plugin.la
 
 libgnutls_plugin_la_SOURCES = misc/gnutls.c
 libgnutls_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNUTLS_CFLAGS)
@@ -37,37 +43,37 @@ if HAVE_DARWIN
 libgnutls_plugin_la_LDFLAGS += -Wl,-framework,Security,-framework,CoreFoundation
 endif
 EXTRA_LTLIBRARIES += libgnutls_plugin.la
-misc_LTLIBRARIES += $(LTLIBgnutls)
+misc_PLUGINS += $(LTLIBgnutls)
 
 if HAVE_DARWIN
 libsecuretransport_plugin_la_SOURCES = misc/securetransport.c
 libsecuretransport_plugin_la_CFLAGS = $(AM_CFLAGS) $(SECURETRANSPORT_CFLAGS)
 libsecuretransport_plugin_la_LIBADD = $(SECURETRANSPORT_LIBS)
 libsecuretransport_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(misc_RPATH) -Wl,-framework,Security,-framework,CoreFoundation
-misc_LTLIBRARIES += libsecuretransport_plugin.la
+misc_PLUGINS += libsecuretransport_plugin.la
 endif
 
 if HAVE_OSX
 libiokit_inhibit_plugin_la_SOURCES = misc/inhibit/iokit-inhibit.c
 libiokit_inhibit_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,CoreFoundation,-framework,IOKit
-misc_LTLIBRARIES += libiokit_inhibit_plugin.la
+misc_PLUGINS += libiokit_inhibit_plugin.la
 endif
 
 libuikit_inhibit_plugin_la_SOURCES = misc/inhibit/uikit-inhibit.m
 libuikit_inhibit_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,UIKit,-framework,Foundation
 libuikit_inhibit_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc
 if HAVE_IOS
-misc_LTLIBRARIES += libuikit_inhibit_plugin.la
+misc_PLUGINS += libuikit_inhibit_plugin.la
 endif
 
 if HAVE_TVOS
-misc_LTLIBRARIES += libuikit_inhibit_plugin.la
+misc_PLUGINS += libuikit_inhibit_plugin.la
 endif
 
 libxdg_screensaver_plugin_la_SOURCES = misc/inhibit/xdg.c
 if HAVE_XCB
 if !HAVE_WIN32
-misc_LTLIBRARIES += libxdg_screensaver_plugin.la
+misc_PLUGINS += libxdg_screensaver_plugin.la
 endif
 endif
 
@@ -75,7 +81,7 @@ libdbus_screensaver_plugin_la_SOURCES = misc/inhibit/dbus.c
 libdbus_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
 libdbus_screensaver_plugin_la_LIBADD = $(DBUS_LIBS)
 if HAVE_DBUS
-misc_LTLIBRARIES += libdbus_screensaver_plugin.la
+misc_PLUGINS += libdbus_screensaver_plugin.la
 endif
 
 libwl_idle_inhibit_plugin_la_SOURCES = misc/inhibit/wl-idle-inhibit.c
@@ -86,7 +92,7 @@ libwl_idle_inhibit_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/misc/inhibi
 libwl_idle_inhibit_plugin_la_CFLAGS = $(WAYLAND_CLIENT_CFLAGS)
 libwl_idle_inhibit_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS)
 if HAVE_WAYLAND
-misc_LTLIBRARIES += libwl_idle_inhibit_plugin.la
+misc_PLUGINS += libwl_idle_inhibit_plugin.la
 BUILT_SOURCES += $(nodist_libwl_idle_inhibit_plugin_la_SOURCES)
 endif
 
@@ -105,7 +111,7 @@ libaddonsvorepository_plugin_la_SOURCES = \
 libaddonsfsstorage_plugin_la_SOURCES = \
 	misc/addons/fsstorage.c misc/addons/xmlreading.h
 if ENABLE_ADDONMANAGERMODULES
-misc_LTLIBRARIES += \
+misc_PLUGINS += \
 	libaddonsvorepository_plugin.la \
 	libaddonsfsstorage_plugin.la
 endif
@@ -115,7 +121,7 @@ libxml_plugin_la_CFLAGS = $(AM_CFLAGS) $(LIBXML2_CFLAGS)
 libxml_plugin_la_LIBADD = $(LIBXML2_LIBS)
 libxml_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(misc_RPATH) $(LDFLAGS_xml)
 EXTRA_LTLIBRARIES += libxml_plugin.la
-misc_LTLIBRARIES += $(LTLIBxml)
+misc_PLUGINS += $(LTLIBxml)
 
 libmedialibrary_plugin_la_SOURCES = \
 	misc/medialibrary/medialibrary.cpp \
@@ -140,4 +146,4 @@ libmedialibrary_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(MEDIALIBRARY_CFLAGS)
 libmedialibrary_plugin_la_LIBADD = $(MEDIALIBRARY_LIBS)
 libmedialibrary_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(misc_RPATH)
 EXTRA_LTLIBRARIES += libmedialibrary_plugin.la
-misc_LTLIBRARIES += $(LTLIBmedialibrary)
+misc_PLUGINS += $(LTLIBmedialibrary)

modules/mux/Makefile.am

@@ -1,6 +1,13 @@
 muxdir = $(pluginsdir)/mux
+mux_LTLIBRARIES =
+mux_PLUGINS =
 mux_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(mux_PLUGINS)
+else
+mux_LTLIBRARIES += $(mux_PLUGINS)
 mux_RPATH += -rpath '$(muxdir)'
+endif
 
 extradata_builder_SOURCES = mux/extradata.c mux/extradata.h \
                             packetizer/av1_obu.c
@@ -25,7 +32,7 @@ libmux_ps_plugin_la_SOURCES = \
 	demux/mpeg/timestamps.h
 libmux_wav_plugin_la_SOURCES = mux/wav.c
 
-mux_LTLIBRARIES = \
+mux_PLUGINS += \
 	libmux_dummy_plugin.la \
 	libmux_asf_plugin.la \
 	libmux_avi_plugin.la \
@@ -39,7 +46,7 @@ libmux_ogg_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(OGG_CFLAGS)
 libmux_ogg_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(mux_RPATH)
 libmux_ogg_plugin_la_LIBADD = $(OGG_LIBS)
 EXTRA_LTLIBRARIES += libmux_ogg_plugin.la
-mux_LTLIBRARIES += $(LTLIBmux_ogg)
+mux_PLUGINS += $(LTLIBmux_ogg)
 
 libmux_ts_plugin_la_SOURCES = \
 	mux/mpeg/pes.c mux/mpeg/pes.h \
@@ -54,5 +61,5 @@ libmux_ts_plugin_la_SOURCES = \
 libmux_ts_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(DVBPSI_CFLAGS)
 libmux_ts_plugin_la_LIBADD = $(DVBPSI_LIBS)
 if HAVE_DVBPSI
-mux_LTLIBRARIES += libmux_ts_plugin.la
+mux_PLUGINS += libmux_ts_plugin.la
 endif

modules/notify/Makefile.am

@@ -1,6 +1,13 @@
 notifydir = $(pluginsdir)/notify
+notify_PLUGINS =
+notify_LTLIBRARIES =
 notify_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(notify_PLUGINS)
+else
+notify_LTLIBRARIES += $(notify_PLUGINS)
 notify_RPATH += -rpath '$(notifydir)'
+endif
 
 libosx_notifications_plugin_la_SOURCES = notify/osx_notifications.m
 libosx_notifications_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc -fobjc-exceptions
@@ -11,5 +18,5 @@ libnotify_plugin_la_CFLAGS = $(AM_CFLAGS) $(NOTIFY_CFLAGS)
 libnotify_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(notify_RPATH)
 libnotify_plugin_la_LIBADD = $(NOTIFY_LIBS)
 
-notify_LTLIBRARIES = $(LTLIBosx_notifications) $(LTLIBnotify)
+notify_PLUGINS += $(LTLIBosx_notifications) $(LTLIBnotify)
 EXTRA_LTLIBRARIES += libosx_notifications_plugin.la libnotify_plugin.la

modules/packetizer/Makefile.am

@@ -1,6 +1,14 @@
 packetizerdir = $(pluginsdir)/packetizer
+packetizer_PLUGINS =
+packetizer_LTLIBRARIES =
 packetizer_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(packetizer_PLUGINS)
+else
+packetizer_LTLIBRARIES += $(packetizer_PLUGINS)
 packetizer_RPATH += -rpath '$(packetizerdir)'
+endif
+
 
 libpacketizer_av1_plugin_la_SOURCES = packetizer/av1.c \
                                       packetizer/av1.h \
@@ -51,7 +59,7 @@ libpacketizer_avparser_plugin_la_LIBADD = $(AVCODEC_LIBS) $(AVUTIL_LIBS) $(LIBM)
 
 noinst_HEADERS += packetizer/packetizer_helper.h packetizer/startcode_helper.h
 
-packetizer_LTLIBRARIES = \
+packetizer_PLUGINS += \
 	libpacketizer_av1_plugin.la \
 	libpacketizer_mpegvideo_plugin.la \
 	libpacketizer_mpeg4video_plugin.la \
@@ -70,7 +78,6 @@ packetizer_LTLIBRARIES = \
 
 if HAVE_AVCODEC
 if !MERGE_FFMPEG
-packetizer_LTLIBRARIES += libpacketizer_avparser_plugin.la
+packetizer_PLUGINS += libpacketizer_avparser_plugin.la
 endif
 endif
-

modules/services_discovery/Makefile.am

@@ -1,29 +1,35 @@
 sddir = $(pluginsdir)/services_discovery
+sd_PLUGINS =
 sd_LTLIBRARIES =
 sd_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(sd_PLUGINS)
+else
+sd_LTLIBRARIES += $(sd_PLUGINS)
 sd_RPATH += -rpath '$(sddir)'
+endif
 
 libpodcast_plugin_la_SOURCES = services_discovery/podcast.c
-sd_LTLIBRARIES += libpodcast_plugin.la
+sd_PLUGINS += libpodcast_plugin.la
 
 libsap_plugin_la_SOURCES = services_discovery/sap.c access/rtp/sdp.c
 libsap_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 libsap_plugin_la_LIBADD = $(SOCKET_LIBS) $(LIBZ)
-sd_LTLIBRARIES += libsap_plugin.la
+sd_PLUGINS += libsap_plugin.la
 
 libavahi_plugin_la_SOURCES = services_discovery/avahi.c
 libavahi_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVAHI_CFLAGS)
 libavahi_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(sd_RPATH)
 libavahi_plugin_la_LIBADD = $(AVAHI_LIBS)
 EXTRA_LTLIBRARIES += libavahi_plugin.la
-sd_LTLIBRARIES += $(LTLIBavahi)
+sd_PLUGINS += $(LTLIBavahi)
 
 libmtp_plugin_la_SOURCES = services_discovery/mtp.c
 libmtp_plugin_la_CFLAGS = $(AM_CFLAGS) $(MTP_CFLAGS)
 libmtp_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(sd_RPATH)
 libmtp_plugin_la_LIBADD = $(MTP_LIBS)
 EXTRA_LTLIBRARIES += libmtp_plugin.la
-sd_LTLIBRARIES += $(LTLIBmtp)
+sd_PLUGINS += $(LTLIBmtp)
 
 libupnp_plugin_la_SOURCES = services_discovery/upnp.cpp services_discovery/upnp.hpp \
 			    services_discovery/upnp-wrapper.hpp \
@@ -38,7 +44,7 @@ libupnp_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(UPNP_CFLAGS)
 libupnp_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(sd_RPATH)
 libupnp_plugin_la_LIBADD = $(UPNP_LIBS)
 EXTRA_LTLIBRARIES += libupnp_plugin.la
-sd_LTLIBRARIES += $(LTLIBupnp)
+sd_PLUGINS += $(LTLIBupnp)
 if HAVE_OSX
 libupnp_plugin_la_LDFLAGS += -Wl,-framework,CoreFoundation,-framework,SystemConfiguration
 endif
@@ -47,7 +53,7 @@ libpulselist_plugin_la_SOURCES = services_discovery/pulse.c
 libpulselist_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
 libpulselist_plugin_la_LIBADD = libvlc_pulse.la $(PULSE_LIBS)
 if HAVE_PULSE
-sd_LTLIBRARIES += libpulselist_plugin.la
+sd_PLUGINS += libpulselist_plugin.la
 endif
 
 libudev_plugin_la_SOURCES = services_discovery/udev.c
@@ -59,42 +65,42 @@ libudev_plugin_la_LIBADD += $(ALSA_LIBS)
 endif
 libudev_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(sd_RPATH)
 EXTRA_LTLIBRARIES += libudev_plugin.la
-sd_LTLIBRARIES += $(LTLIBudev)
+sd_PLUGINS += $(LTLIBudev)
 
 libxcb_apps_plugin_la_SOURCES = services_discovery/xcb_apps.c
 libxcb_apps_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
 libxcb_apps_plugin_la_LIBADD = $(XCB_LIBS)
 if HAVE_XCB
-sd_LTLIBRARIES += libxcb_apps_plugin.la
+sd_PLUGINS += libxcb_apps_plugin.la
 endif
 
 libwindrive_plugin_la_SOURCES = services_discovery/windrive.c
 if HAVE_WIN32_DESKTOP
-sd_LTLIBRARIES += libwindrive_plugin.la
+sd_PLUGINS += libwindrive_plugin.la
 endif
 
 libos2drive_plugin_la_SOURCES = services_discovery/os2drive.c
 if HAVE_OS2
-sd_LTLIBRARIES += libos2drive_plugin.la
+sd_PLUGINS += libos2drive_plugin.la
 endif
 
 libmicrodns_plugin_la_SOURCES = services_discovery/microdns.c
 libmicrodns_plugin_la_CFLAGS = $(AM_CFLAGS) $(MICRODNS_CFLAGS)
 libmicrodns_plugin_la_LIBADD = $(SOCKET_LIBS) $(MICRODNS_LIBS)
-sd_LTLIBRARIES += $(LTLIBmicrodns)
 libmicrodns_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(sd_RPATH)
+sd_PLUGINS += $(LTLIBmicrodns)
 EXTRA_LTLIBRARIES += libmicrodns_plugin.la
 
 libbonjour_plugin_la_SOURCES = services_discovery/bonjour.m
 libbonjour_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc
 libbonjour_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(sd_RPATH) -Wl,-framework,Foundation
 if HAVE_DARWIN
-sd_LTLIBRARIES += libbonjour_plugin.la
+sd_PLUGINS += libbonjour_plugin.la
 endif
 
 libudisks_plugin_la_SOURCES = services_discovery/udisks.c
 libudisks_plugin_la_CFLAGS = $(AM_CFLAGS) $(SDBUS_CFLAGS)
 libudisks_plugin_la_LIBADD = $(SDBUS_LIBS)
 if HAVE_SDBUS
-sd_LTLIBRARIES += libudisks_plugin.la
+sd_PLUGINS += libudisks_plugin.la
 endif

modules/spu/Makefile.am

@@ -1,10 +1,17 @@
 spudir = $(pluginsdir)/spu
+spu_PLUGINS =
+spu_LTLIBRARIES =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(spu_PLUGINS)
+else
+spu_LTLIBRARIES += $(spu_PLUGINS)
+endif
 
 noinst_HEADERS += spu/common.h
 
 # sub filters
 libsubsdelay_plugin_la_SOURCES = spu/subsdelay.c
-spu_LTLIBRARIES = libsubsdelay_plugin.la
+spu_PLUGINS += libsubsdelay_plugin.la
 
 # sub sources
 libaudiobargraph_v_plugin_la_SOURCES = spu/audiobargraph_v.c
@@ -15,7 +22,7 @@ libmosaic_plugin_la_SOURCES = spu/mosaic.c spu/mosaic.h
 libmosaic_plugin_la_LIBADD = $(LIBM)
 librss_plugin_la_SOURCES = spu/rss.c
 
-spu_LTLIBRARIES += \
+spu_PLUGINS += \
 	libaudiobargraph_v_plugin.la \
 	liblogo_plugin.la \
 	libmarq_plugin.la \
@@ -29,5 +36,5 @@ libdynamicoverlay_plugin_la_SOURCES = \
 	spu/dynamicoverlay/dynamicoverlay_commands.c \
 	spu/dynamicoverlay/dynamicoverlay.c spu/dynamicoverlay/dynamicoverlay.h
 if !HAVE_WIN32
-spu_LTLIBRARIES += libdynamicoverlay_plugin.la
+spu_PLUGINS += libdynamicoverlay_plugin.la
 endif

modules/stream_extractor/Makefile.am

@@ -1,11 +1,17 @@
 stream_extractordir = $(pluginsdir)/stream_extractor
+stream_extractor_PLUGINS =
 stream_extractor_LTLIBRARIES =
 stream_extractor_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(stream_extractor_PLUGINS)
+else
+stream_extractor_LTLIBRARIES += $(stream_extractor_PLUGINS)
 stream_extractor_RPATH += -rpath '$(stream_extractordir)'
+endif
 
 libarchive_plugin_la_SOURCES = stream_extractor/archive.c
 libarchive_plugin_la_CFLAGS = $(AM_CFLAGS) $(ARCHIVE_CFLAGS)
 libarchive_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(stream_extractor_RPATH)
 libarchive_plugin_la_LIBADD = $(ARCHIVE_LIBS)
 EXTRA_LTLIBRARIES += libarchive_plugin.la
-stream_extractor_LTLIBRARIES += $(LTLIBarchive)
+stream_extractor_PLUGINS += $(LTLIBarchive)

modules/stream_filter/Makefile.am

@@ -1,45 +1,51 @@
 stream_filterdir = $(pluginsdir)/stream_filter
-
+stream_filter_PLUGINS =
 stream_filter_LTLIBRARIES =
 stream_filter_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(stream_filter_PLUGINS)
+else
+stream_filter_LTLIBRARIES += $(stream_filter_PLUGINS)
 stream_filter_RPATH += -rpath '$(stream_filterdir)'
+endif
 
 libcache_read_plugin_la_SOURCES = stream_filter/cache_read.c
-stream_filter_LTLIBRARIES += libcache_read_plugin.la
+stream_filter_PLUGINS += libcache_read_plugin.la
 
 libcache_block_plugin_la_SOURCES = stream_filter/cache_block.c
-stream_filter_LTLIBRARIES += libcache_block_plugin.la
+stream_filter_PLUGINS += libcache_block_plugin.la
 
 libdecomp_plugin_la_SOURCES = stream_filter/decomp.c
 if !HAVE_WIN32
 if !HAVE_TVOS
-stream_filter_LTLIBRARIES += libdecomp_plugin.la
+stream_filter_PLUGINS += libdecomp_plugin.la
 endif
 endif
 
 libinflate_plugin_la_SOURCES = stream_filter/inflate.c
 libinflate_plugin_la_LIBADD = -lz
 if HAVE_ZLIB
-stream_filter_LTLIBRARIES += libinflate_plugin.la
+stream_filter_PLUGINS += libinflate_plugin.la
 endif
 
 libprefetch_plugin_la_SOURCES = stream_filter/prefetch.c
 if !HAVE_WINSTORE
-stream_filter_LTLIBRARIES += libprefetch_plugin.la
+stream_filter_PLUGINS += libprefetch_plugin.la
 endif
 
 libhds_plugin_la_SOURCES = stream_filter/hds/hds.c
 
-stream_filter_LTLIBRARIES += libhds_plugin.la
+libhds_plugin_la_CFLAGS = $(AM_CFLAGS)
+stream_filter_PLUGINS += libhds_plugin.la
 
 librecord_plugin_la_SOURCES = stream_filter/record.c
-stream_filter_LTLIBRARIES += librecord_plugin.la
+stream_filter_PLUGINS += librecord_plugin.la
 
 libaribcam_plugin_la_SOURCES = stream_filter/aribcam.c
 libaribcam_plugin_la_CFLAGS = $(AM_CFLAGS) $(ARIBB25_CFLAGS)
 libaribcam_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(ARIBB25_LDFLAGS) $(stream_filter_RPATH)
 libaribcam_plugin_la_LIBADD = $(ARIBB25_LIBS)
-stream_filter_LTLIBRARIES += $(LTLIBaribcam)
+stream_filter_PLUGINS += $(LTLIBaribcam)
 EXTRA_LTLIBRARIES += libaribcam_plugin.la
 
 libaccesstweaks_plugin_la_SOURCES = stream_filter/accesstweaks.c
@@ -47,7 +53,7 @@ libaccesstweaks_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(stream_filte_RPATH)
 check_LTLIBRARIES += libaccesstweaks_plugin.la
 
 libadf_plugin_la_SOURCES = stream_filter/adf.c
-stream_filter_LTLIBRARIES += libadf_plugin.la
+stream_filter_PLUGINS += libadf_plugin.la
 
 libskiptags_plugin_la_SOURCES = stream_filter/skiptags.c
-stream_filter_LTLIBRARIES += libskiptags_plugin.la
+stream_filter_PLUGINS += libskiptags_plugin.la

modules/stream_out/Makefile.am

@@ -1,6 +1,14 @@
 soutdir = $(pluginsdir)/stream_out
+sout_PLUGINS =
+sout_LTLIBRARIES =
 sout_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(sout_PLUGINS)
+else
+sout_LTLIBRARIES += $(sout_PLUGINS)
 sout_RPATH += -rpath '$(soutdir)'
+endif
+
 
 libstream_out_dummy_plugin_la_SOURCES = stream_out/dummy.c
 libstream_out_cycle_plugin_la_SOURCES = stream_out/cycle.c
@@ -36,7 +44,7 @@ libstream_out_udp_plugin_la_SOURCES = \
 	stream_out/udp.c
 libstream_out_udp_plugin_la_LIBADD = $(SOCKET_LIBS)
 
-sout_LTLIBRARIES = \
+sout_PLUGINS += \
 	libstream_out_dummy_plugin.la \
 	libstream_out_cycle_plugin.la \
 	libstream_out_delay_plugin.la \
@@ -85,11 +93,11 @@ libstream_out_sdi_plugin_la_SOURCES = stream_out/sdi/sdiout.cpp \
         stream_out/sdi/SDIStream.hpp \
         stream_out/sdi/V210.cpp \
         stream_out/sdi/V210.hpp
-sout_LTLIBRARIES += libstream_out_sdi_plugin.la
+sout_PLUGINS += libstream_out_sdi_plugin.la
 endif
 
 # RTP plugin
-sout_LTLIBRARIES += libstream_out_rtp_plugin.la
+sout_PLUGINS += libstream_out_rtp_plugin.la
 libstream_out_rtp_plugin_la_SOURCES = \
 	stream_out/sdp_helper.c stream_out/sdp_helper.h \
 	stream_out/rtp.c stream_out/rtp.h stream_out/rtpfmt.c \
@@ -110,7 +118,7 @@ libstream_out_chromaprint_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(CHROMAPRINT_CFLA
 libstream_out_chromaprint_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(sout_RPATH)
 libstream_out_chromaprint_plugin_la_LIBADD = $(CHROMAPRINT_LIBS)
 EXTRA_LTLIBRARIES += libstream_out_chromaprint_plugin.la
-sout_LTLIBRARIES += $(LTLIBstream_out_chromaprint)
+sout_PLUGINS += $(LTLIBstream_out_chromaprint)
 
 # Chromecast plugin
 SUFFIXES += .proto .pb.cc
@@ -140,7 +148,7 @@ if ENABLE_SOUT
 if BUILD_CHROMECAST
 BUILT_SOURCES += stream_out/chromecast/@PROTOBUF_VERSION@/cast_channel.pb.cc \
                  stream_out/chromecast/@PROTOBUF_VERSION@/cast_channel.pb.h
-sout_LTLIBRARIES += libstream_out_chromecast_plugin.la
-demux_LTLIBRARIES += libdemux_chromecast_plugin.la
+sout_PLUGINS += libstream_out_chromecast_plugin.la
+demux_PLUGINS += libdemux_chromecast_plugin.la
 endif
 endif

modules/text_renderer/Makefile.am

@@ -1,9 +1,16 @@
 textdir = $(pluginsdir)/text_renderer
+text_PLUGINS =
+text_LTLIBRARIES =
 text_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(text_PLUGINS)
+else
+text_LTLIBRARIES += $(text_PLUGINS)
 text_RPATH += -rpath '$(textdir)'
+endif
 
 libtdummy_plugin_la_SOURCES = text_renderer/tdummy.c
-text_LTLIBRARIES = libtdummy_plugin.la
+text_PLUGINS += libtdummy_plugin.la
 
 libfreetype_plugin_la_SOURCES = \
 	text_renderer/freetype/platform_fonts.c text_renderer/freetype/platform_fonts.h \
@@ -56,7 +63,7 @@ endif
 libfreetype_plugin_la_LINK += $(libfreetype_plugin_la_LDFLAGS)
 libfreetype_plugin_la_LIBADD += $(FREETYPE_LIBS)
 if HAVE_FREETYPE
-text_LTLIBRARIES += libfreetype_plugin.la
+text_PLUGINS += libfreetype_plugin.la
 endif
 
 # SVG plugin
@@ -65,13 +72,13 @@ libsvg_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(SVG_CFLAGS)
 libsvg_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(text_RPATH)
 libsvg_plugin_la_LIBADD = $(SVG_LIBS)
 EXTRA_LTLIBRARIES += libsvg_plugin.la
-text_LTLIBRARIES += $(LTLIBsvg)
+text_PLUGINS += $(LTLIBsvg)
 
 # OS X TTS
 libnsspeechsynthesizer_plugin_la_SOURCES = text_renderer/nsspeechsynthesizer.m
 libnsspeechsynthesizer_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,Cocoa
 if HAVE_OSX
-text_LTLIBRARIES += libnsspeechsynthesizer_plugin.la
+text_PLUGINS += libnsspeechsynthesizer_plugin.la
 endif
 
 # SAPI TTS (win32)
@@ -79,5 +86,5 @@ libsapi_plugin_la_SOURCES = text_renderer/sapi.cpp
 libsapi_plugin_la_LIBADD = $(LIBCOM)
 libsapi_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(LIBCOMCXXFLAGS)
 if HAVE_SAPI
-text_LTLIBRARIES += libsapi_plugin.la
+text_PLUGINS += libsapi_plugin.la
 endif

modules/video_chroma/Makefile.am

@@ -1,6 +1,14 @@
 chromadir = $(pluginsdir)/video_chroma
+chroma_PLUGINS =
+chroma_LTLIBRARIES =
 chroma_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(chroma_PLUGINS)
+else
+chroma_LTLIBRARIES += $(chroma_PLUGINS)
 chroma_RPATH += -rpath '$(chromadir)'
+endif
+
 
 libchain_plugin_la_SOURCES = video_chroma/chain.c
 
@@ -40,7 +48,7 @@ libyuvp_plugin_la_SOURCES = video_chroma/yuvp.c
 
 liborient_plugin_la_SOURCES = video_chroma/orient.c video_chroma/orient.h
 
-chroma_LTLIBRARIES = \
+chroma_PLUGINS += \
 	libi420_rgb_plugin.la \
 	libi420_yuy2_plugin.la \
 	libi420_nv12_plugin.la \
@@ -62,7 +70,7 @@ libi420_yuy2_altivec_plugin_la_SOURCES = video_chroma/i420_yuy2.c video_chroma/i
 libi420_yuy2_altivec_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_ALTIVEC
 
 if HAVE_ALTIVEC
-chroma_LTLIBRARIES += \
+chroma_PLUGINS += \
 	libi420_yuy2_altivec_plugin.la
 endif
 
@@ -78,7 +86,7 @@ libi422_yuy2_sse2_plugin_la_SOURCES = video_chroma/i422_yuy2.c video_chroma/i422
 libi422_yuy2_sse2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_SSE2
 
 if HAVE_SSE2
-chroma_LTLIBRARIES += \
+chroma_PLUGINS += \
 	libi420_rgb_sse2_plugin.la \
 	libi420_yuy2_sse2_plugin.la \
 	libi422_yuy2_sse2_plugin.la
@@ -88,7 +96,7 @@ libcvpx_plugin_la_SOURCES = codec/vt_utils.c codec/vt_utils.h video_chroma/cvpx.
 libcvpx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -Wl,-framework,Foundation -Wl,-framework,VideoToolbox -Wl,-framework,CoreMedia -Wl,-framework,CoreVideo
 libcvpx_plugin_la_LIBADD = libchroma_copy.la
 if HAVE_DARWIN
-chroma_LTLIBRARIES += libcvpx_plugin.la
+chroma_PLUGINS += libcvpx_plugin.la
 endif
 
 # Tests

modules/video_filter/Makefile.am

@@ -1,6 +1,13 @@
 video_filterdir = $(pluginsdir)/video_filter
 video_filter_RPATH =
+video_filter_PLUGINS =
+video_filter_LTLIBRARIES =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(video_filter_PLUGINS)
+else
+video_filter_LTLIBRARIES += $(video_filter_PLUGINS)
 video_filter_RPATH += -rpath '$(video_filterdir)'
+endif
 
 noinst_HEADERS += video_filter/filter_picture.h
 
@@ -72,7 +79,7 @@ libvhs_plugin_la_SOURCES = video_filter/vhs.c
 libwave_plugin_la_SOURCES = video_filter/wave.c
 libwave_plugin_la_LIBADD = $(LIBM)
 
-video_filter_LTLIBRARIES = \
+video_filter_PLUGINS += \
 	libadjust_plugin.la \
 	libalphamask_plugin.la \
 	libball_plugin.la \
@@ -118,14 +125,15 @@ libci_filters_plugin_la_SOURCES = video_filter/ci_filters.m codec/vt_utils.c cod
 libci_filters_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(video_filter_RPATH) \
 	-Wl,-framework,Foundation -Wl,-framework,CoreGraphics -Wl,-framework,CoreImage \
 	-Wl,-framework,CoreVideo
+
 if HAVE_OSX
 libci_filters_plugin_la_LDFLAGS += -Wl,-framework,OpenGL
-video_filter_LTLIBRARIES += libci_filters_plugin.la
+video_filter_PLUGINS += libci_filters_plugin.la
 endif
 
 if HAVE_IOS
 libci_filters_plugin_la_LDFLAGS += -Wl,-framework,OpenGLES
-video_filter_LTLIBRARIES += libci_filters_plugin.la
+video_filter_PLUGINS += libci_filters_plugin.la
 endif
 
 libopengl_filter_plugin_la_SOURCES = video_filter/opengl.c
@@ -134,11 +142,11 @@ if HAVE_LINUX
 if HAVE_ANDROID
 libopengl_filter_plugin_la_LIBADD = libvlc_opengles.la
 libopengl_filter_plugin_la_CFLAGS = -DUSE_OPENGL_ES2=1
-video_filter_LTLIBRARIES += libopengl_filter_plugin.la
+video_filter_PLUGINS += libopengl_filter_plugin.la
 else
 libopengl_filter_plugin_la_LIBADD = libvlc_opengl.la
 if HAVE_GL
-video_filter_LTLIBRARIES += libopengl_filter_plugin.la
+video_filter_PLUGINS += libopengl_filter_plugin.la
 endif
 endif
 endif
@@ -146,18 +154,18 @@ endif
 if HAVE_IOS
 libopengl_filter_plugin_la_LIBADD = libvlc_opengles.la
 libopengl_filter_plugin_la_CFLAGS = -DUSE_OPENGL_ES2=1
-video_filter_LTLIBRARIES += libopengl_filter_plugin.la
+video_filter_PLUGINS += libopengl_filter_plugin.la
 endif
 
 if HAVE_TVOS
 libopengl_filter_plugin_la_LIBADD = libvlc_opengles.la
 libopengl_filter_plugin_la_CFLAGS = -DUSE_OPENGL_ES2=1
-video_filter_LTLIBRARIES += libopengl_filter_plugin.la
+video_filter_PLUGINS += libopengl_filter_plugin.la
 endif
 
 if HAVE_OSX
 libopengl_filter_plugin_la_LIBADD = libvlc_opengl.la
-video_filter_LTLIBRARIES += libopengl_filter_plugin.la
+video_filter_PLUGINS += libopengl_filter_plugin.la
 endif
 
 libdeinterlace_common_la_SOURCES = video_filter/deinterlace/common.c video_filter/deinterlace/common.h
@@ -185,17 +193,17 @@ if HAVE_ALTIVEC
 libdeinterlace_plugin_la_CPPFLAGS += -DCAN_COMPILE_C_ALTIVEC
 endif
 libdeinterlace_plugin_la_LIBADD = libdeinterlace_common.la
-video_filter_LTLIBRARIES += libdeinterlace_plugin.la
+video_filter_PLUGINS += libdeinterlace_plugin.la
 
 libglblend_plugin_la_SOURCES = video_filter/deinterlace/glblend.c
 libglblend_plugin_la_CFLAGS = $(AM_CFLAGS)
 if HAVE_GL
 libglblend_plugin_la_LIBADD = libvlc_opengl.la
-video_filter_LTLIBRARIES += libglblend_plugin.la
+video_filter_PLUGINS += libglblend_plugin.la
 endif
 
 if HAVE_DARWIN
-video_filter_LTLIBRARIES += libglblend_plugin.la
+video_filter_PLUGINS += libglblend_plugin.la
 if HAVE_OSX
 libglblend_plugin_la_LIBADD = libvlc_opengl.la
 else
@@ -207,30 +215,30 @@ endif
 if HAVE_ANDROID
 libglblend_plugin_la_LIBADD = libvlc_opengles.la
 libglblend_plugin_la_CFLAGS += -DUSE_OPENGL_ES2=1
-video_filter_LTLIBRARIES += libglblend_plugin.la
+video_filter_PLUGINS += libglblend_plugin.la
 endif
 
 libopencv_wrapper_plugin_la_SOURCES = video_filter/opencv_wrapper.c
 libopencv_wrapper_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(OPENCV_CFLAGS)
 libopencv_wrapper_plugin_la_LIBADD = $(OPENCV_LIBS)
-video_filter_LTLIBRARIES += $(LTLIBopencv_wrapper)
 libopencv_wrapper_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(video_filter_RPATH)
+video_filter_PLUGINS += $(LTLIBopencv_wrapper)
 EXTRA_LTLIBRARIES += libopencv_wrapper_plugin.la
 
 libpostproc_plugin_la_SOURCES = video_filter/postproc.c
 libpostproc_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(POSTPROC_CFLAGS) $(AVUTIL_CFLAGS)
 libpostproc_plugin_la_LIBADD = $(LIBM) $(POSTPROC_LIBS) $(AVUTIL_LIBS)
-video_filter_LTLIBRARIES += $(LTLIBpostproc)
 libpostproc_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(video_filter_RPATH)
+video_filter_PLUGINS += $(LTLIBpostproc)
 EXTRA_LTLIBRARIES += libpostproc_plugin.la
 
 # misc
 libblend_plugin_la_SOURCES = video_filter/blend.cpp
-video_filter_LTLIBRARIES += libblend_plugin.la
+video_filter_PLUGINS += libblend_plugin.la
 
 libopencv_example_plugin_la_SOURCES = video_filter/opencv_example.cpp video_filter/filter_event_info.h
 libopencv_example_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(OPENCV_CFLAGS)
 libopencv_example_plugin_la_LIBADD = $(OPENCV_LIBS)
-video_filter_LTLIBRARIES += $(LTLIBopencv_example)
 libopencv_example_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(video_filter_RPATH)
+video_filter_PLUGINS += $(LTLIBopencv_example)
 EXTRA_LTLIBRARIES += libopencv_example_plugin.la

modules/video_output/Makefile.am

@@ -1,7 +1,13 @@
 voutdir = $(pluginsdir)/video_output
+vout_PLUGINS =
 vout_LTLIBRARIES =
 vout_RPATH =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(vout_PLUGINS)
+else
+vout_LTLIBRARIES += $(vout_PLUGINS)
 vout_RPATH += -rpath '$(voutdir)'
+endif
 
 EXTRA_DIST += video_output/README
 
@@ -32,7 +38,7 @@ endif
 if HAVE_LINUX
 libdecklinkoutput_plugin_la_LIBADD += $(LIBDL)
 endif
-vout_LTLIBRARIES += libdecklinkoutput_plugin.la
+vout_PLUGINS += libdecklinkoutput_plugin.la
 endif
 
 libglinterop_cvpx_plugin_la_SOURCES = video_output/opengl/interop_cvpx.m \
@@ -48,7 +54,7 @@ else
 libglinterop_cvpx_plugin_la_CPPFLAGS += -DUSE_OPENGL_ES2
 libglinterop_cvpx_plugin_la_LDFLAGS += -Wl,-framework,OpenGLES
 endif
-vout_LTLIBRARIES += libglinterop_cvpx_plugin.la
+vout_PLUGINS += libglinterop_cvpx_plugin.la
 endif
 
 if HAVE_OSX
@@ -72,7 +78,7 @@ libcaopengllayer_plugin_la_LIBADD = libvlc_opengl.la
 libcaopengllayer_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(vout_RPATH) \
 	-Wl,-framework,OpenGL,-framework,Cocoa,-framework,QuartzCore
 
-vout_LTLIBRARIES += libvout_macosx_plugin.la libcaopengllayer_plugin.la libwindow_macosx_plugin.la
+vout_PLUGINS += libvout_macosx_plugin.la libcaopengllayer_plugin.la libwindow_macosx_plugin.la
 endif
 
 libvout_ios_plugin_la_SOURCES = video_output/opengl/display.c $(OPENGL_VOUT_COMMONSOURCES)
@@ -105,16 +111,16 @@ libcvpx_gl_plugin_la_CPPFLAGS += -DUSE_OPENGL_ES2
 libcvpx_gl_plugin_la_LDFLAGS += -Wl,-framework,OpenGLES
 libcvpx_gl_plugin_la_LIBADD += libvlc_opengles.la
 endif
-vout_LTLIBRARIES += libcvpx_gl_plugin.la
+vout_PLUGINS += libcvpx_gl_plugin.la
 endif
 
 if HAVE_IOS
-vout_LTLIBRARIES += libvout_ios_plugin.la \
+vout_PLUGINS += libvout_ios_plugin.la \
 	libuiview_window_plugin.la \
 	libcaeagl_ios_plugin.la
 endif
 if HAVE_TVOS
-vout_LTLIBRARIES += \
+vout_PLUGINS += \
 	libvout_ios_plugin.la \
 	libuiview_window_plugin.la \
 	libcaeagl_ios_plugin.la
@@ -134,12 +140,12 @@ libglinterop_vdpau_plugin_la_LIBADD = $(LIBDL) libvlc_vdpau.la $(X_LIBS) $(X_PRE
 if HAVE_GL
 if HAVE_EGL
 if HAVE_VAAPI
-vout_LTLIBRARIES += libglinterop_vaapi_plugin.la
+vout_PLUGINS += libglinterop_vaapi_plugin.la
 endif
 endif # HAVE_EGL
 
 if HAVE_VDPAU
-vout_LTLIBRARIES += libglinterop_vdpau_plugin.la
+vout_PLUGINS += libglinterop_vdpau_plugin.la
 endif
 endif # HAVE_GL
 
@@ -168,10 +174,10 @@ libglinterop_dxva2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
 libglinterop_dxva2_plugin_la_LIBADD = libd3d9_common.la -lopengl32
 
 if HAVE_WIN32_DESKTOP
-vout_LTLIBRARIES += $(LTLIBdirect3d9)
+vout_PLUGINS += $(LTLIBdirect3d9)
 EXTRA_LTLIBRARIES += libdirect3d9_plugin.la
 if HAVE_GL
-vout_LTLIBRARIES += libglinterop_dxva2_plugin.la
+vout_PLUGINS += libglinterop_dxva2_plugin.la
 endif
 endif
 
@@ -195,8 +201,8 @@ else
 libdirect3d11_plugin_la_LIBADD += -ld3d11
 libdirect3d11_plugin_la_LIBADD += -ld3dcompiler_47
 endif
-vout_LTLIBRARIES += $(LTLIBdirect3d11)
 libdirect3d11_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(vout_RPATH)
+vout_PLUGINS += $(LTLIBdirect3d11)
 EXTRA_LTLIBRARIES += libdirect3d11_plugin.la
 
 libglwin32_plugin_la_SOURCES = $(OPENGL_VOUT_COMMONSOURCES) \
@@ -217,7 +223,7 @@ libglwin32_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(vout_RPATH)
 libwgl_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(vout_RPATH)
 
 if HAVE_WIN32_DESKTOP
-vout_LTLIBRARIES += $(LTLIBglwin32) $(LTLIBwgl)
+vout_PLUGINS += $(LTLIBglwin32) $(LTLIBwgl)
 EXTRA_LTLIBRARIES += libglwin32_plugin.la libwgl_plugin.la
 endif
 
@@ -227,12 +233,12 @@ libwingdi_plugin_la_SOURCES = video_output/win32/wingdi.c \
 	video_output/win32/win32touch.c video_output/win32/win32touch.h
 libwingdi_plugin_la_LIBADD = libchroma_copy.la -lgdi32 $(LIBCOM) -luuid
 if HAVE_WIN32_DESKTOP
-vout_LTLIBRARIES += libwingdi_plugin.la
+vout_PLUGINS += libwingdi_plugin.la
 endif
 
 libwinhibit_plugin_la_SOURCES = video_output/win32/inhibit.c
 if HAVE_WIN32_DESKTOP
-vout_LTLIBRARIES += libwinhibit_plugin.la
+vout_PLUGINS += libwinhibit_plugin.la
 endif
 
 libegl_win32_plugin_la_SOURCES = video_output/opengl/egl.c
@@ -241,39 +247,39 @@ libegl_win32_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS)
 libegl_win32_plugin_la_LIBADD = $(EGL_LIBS)
 if HAVE_WIN32
 if HAVE_EGL
-vout_LTLIBRARIES += libegl_win32_plugin.la
+vout_PLUGINS += libegl_win32_plugin.la
 endif
 endif
 
 libdrawable_plugin_la_SOURCES = video_output/win32/drawable.c \
 	video_output/wasync_resize_compressor.h
 if HAVE_WIN32_DESKTOP
-vout_LTLIBRARIES += libdrawable_plugin.la
+vout_PLUGINS += libdrawable_plugin.la
 endif
 
 libwin32_window_plugin_la_SOURCES = video_output/win32/window.c \
 	video_output/wasync_resize_compressor.h
 libwin32_window_plugin_la_LIBADD = -lgdi32
 if HAVE_WIN32_DESKTOP
-vout_LTLIBRARIES += libwin32_window_plugin.la
+vout_PLUGINS += libwin32_window_plugin.la
 endif
 
 
 ### OS/2 ###
 libdrawable_os2_plugin_la_SOURCES = video_output/drawable_os2.c
 if HAVE_OS2
-vout_LTLIBRARIES += libdrawable_os2_plugin.la
+vout_PLUGINS += libdrawable_os2_plugin.la
 endif
 
 libwindow_os2_plugin_la_SOURCES = video_output/window_os2.c
 if HAVE_OS2
-vout_LTLIBRARIES += libwindow_os2_plugin.la
+vout_PLUGINS += libwindow_os2_plugin.la
 endif
 
 libkva_plugin_la_SOURCES = video_output/kva.c
 libkva_plugin_la_LIBADD = $(KVA_LIBS)
 if HAVE_KVA
-vout_LTLIBRARIES += libkva_plugin.la
+vout_PLUGINS += libkva_plugin.la
 endif
 
 
@@ -302,9 +308,11 @@ libglinterop_android_plugin_la_CFLAGS = $(AM_CFLAGS) -DUSE_OPENGL_ES2
 libglinterop_android_plugin_la_LIBADD = libandroid_utils.la
 
 if HAVE_ANDROID
-vout_LTLIBRARIES += libandroid_window_plugin.la libandroid_display_plugin.la
+vout_PLUGINS += libandroid_window_plugin.la libandroid_display_plugin.la
 if HAVE_EGL
-vout_LTLIBRARIES += libegl_android_plugin.la libglinterop_android_plugin.la
+vout_PLUGINS += \
+	libegl_android_plugin.la \
+	libglinterop_android_plugin.la
 endif
 endif
 
@@ -322,11 +330,11 @@ libdrm_display_plugin_la_SOURCES = \
 	video_output/drm/display.c
 libdrm_display_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
 if HAVE_DRM
-vout_LTLIBRARIES += libdrm_display_plugin.la
+vout_PLUGINS += libdrm_display_plugin.la
 endif
 if HAVE_LIBDRM
 libdrm_display_plugin_la_CPPFLAGS += $(LIBDRM_CFLAGS) -DHAVE_LIBDRM
-vout_LTLIBRARIES += libkms_plugin.la libdrm_display_plugin.la
+vout_PLUGINS += libkms_plugin.la libdrm_display_plugin.la
 endif
 
 ### Coloured ASCII art ###
@@ -340,7 +348,7 @@ endif
 endif
 libcaca_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(vout_RPATH)
 EXTRA_LTLIBRARIES += libcaca_plugin.la
-vout_LTLIBRARIES += $(LTLIBcaca)
+vout_PLUGINS += $(LTLIBcaca)
 
 ### Common ###
 
@@ -355,7 +363,7 @@ libwextern_plugin_la_SOURCES = video_output/wextern.c
 libyuv_plugin_la_SOURCES = video_output/yuv.c
 libvgl_plugin_la_SOURCES = video_output/vgl.c
 
-vout_LTLIBRARIES += \
+vout_PLUGINS += \
 	libflaschen_plugin.la \
 	libvdummy_plugin.la \
 	libvideo_splitter_plugin.la \

modules/video_output/libplacebo/Makefile.am

@@ -17,7 +17,7 @@ libplacebo_plugin_la_SOURCES = $(LIBPLACEBO_COMMONSOURCES) \
 libplacebo_plugin_la_CFLAGS = $(AM_CFLAGS) $(LIBPLACEBO_CFLAGS)
 libplacebo_plugin_la_LIBADD = $(LIBPLACEBO_LIBS) libplacebo_utils.la
 
-vout_LTLIBRARIES += libplacebo_plugin.la
+vout_PLUGINS += libplacebo_plugin.la
 
 ### Vulkan ###
 libplacebo_vk_plugin_la_SOURCES = $(LIBPLACEBO_COMMONSOURCES) \
@@ -29,7 +29,7 @@ libplacebo_vk_plugin_la_LIBADD = $(LIBPLACEBO_LIBS) $(VULKAN_LIBS)
 libplacebo_vk_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(vout_RPATH)
 
 if HAVE_VULKAN
-vout_LTLIBRARIES += $(LTLIBplacebo_vk)
+vout_PLUGINS += $(LTLIBplacebo_vk)
 EXTRA_LTLIBRARIES += libplacebo_vk_plugin.la
 endif
 
@@ -47,11 +47,11 @@ libplacebo_gles2_plugin_la_LIBADD = $(LIBPLACEBO_LIBS) libvlc_opengles.la
 libplacebo_gles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(vout_RPATH)
 
 if HAVE_GL
-vout_LTLIBRARIES += $(LTLIBplacebo_gl)
+vout_PLUGINS += $(LTLIBplacebo_gl)
 EXTRA_LTLIBRARIES += libplacebo_gl_plugin.la
 endif
 
 if HAVE_GLES2
-vout_LTLIBRARIES += $(LTLIBplacebo_gles2)
+vout_PLUGINS += $(LTLIBplacebo_gles2)
 EXTRA_LTLIBRARIES += libplacebo_gles2_plugin.la
 endif

modules/video_output/opengl/Makefile.am

@@ -91,7 +91,7 @@ libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2
 libgles2_plugin_la_LIBADD = libvlc_opengles.la
 libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(vout_RPATH)
 if HAVE_GLES2
-vout_LTLIBRARIES += libgles2_plugin.la
+vout_PLUGINS += libgles2_plugin.la
 endif
 
 libgl_plugin_la_SOURCES = video_output/opengl/display.c \
@@ -99,22 +99,22 @@ libgl_plugin_la_SOURCES = video_output/opengl/display.c \
 libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) $(OPENGL_COMMONCFLAGS)
 libgl_plugin_la_LIBADD = libvlc_opengl.la
 if HAVE_GL
-vout_LTLIBRARIES += libgl_plugin.la
+vout_PLUGINS += libgl_plugin.la
 endif # HAVE_GL
 
 if HAVE_OSX
-vout_LTLIBRARIES += libgl_plugin.la
+vout_PLUGINS += libgl_plugin.la
 endif
 
 libglfilter_draw_plugin_la_SOURCES = video_output/opengl/filter_draw.c
 libglfilter_draw_plugin_la_LDFLAGS = $(AM_LDFLAGS)
 if HAVE_GL
 libglfilter_draw_plugin_la_LIBADD = libvlc_opengl.la $(GL_LIBS)
-vout_LTLIBRARIES += libglfilter_draw_plugin.la
+vout_PLUGINS += libglfilter_draw_plugin.la
 endif
 
 if HAVE_DARWIN
-vout_LTLIBRARIES += libglfilter_draw_plugin.la
+vout_PLUGINS += libglfilter_draw_plugin.la
 if HAVE_OSX
 libglfilter_draw_plugin_la_LIBADD = libvlc_opengl.la
 else
@@ -126,7 +126,7 @@ endif
 if HAVE_ANDROID
 libglfilter_draw_plugin_la_LIBADD = libvlc_opengles.la $(GLES2_LIBS)
 libglfilter_draw_plugin_la_CFLAGS = -DUSE_OPENGL_ES2=1
-vout_LTLIBRARIES += libglfilter_draw_plugin.la
+vout_PLUGINS += libglfilter_draw_plugin.la
 endif
 
 libglfilter_mock_plugin_la_SOURCES = video_output/opengl/filter_mock.c
@@ -162,11 +162,11 @@ libpl_scale_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBPLACEBO_CFLAGS)
 libpl_scale_plugin_la_LIBADD = $(LIBPLACEBO_LIBS)
 if HAVE_GL
 libpl_scale_plugin_la_LIBADD += libvlc_opengl.la
-video_filter_LTLIBRARIES += libpl_scale_plugin.la
+video_filter_PLUGINS += libpl_scale_plugin.la
 endif
 
 if HAVE_DARWIN
-video_filter_LTLIBRARIES += libpl_scale_plugin.la
+video_filter_PLUGINS += libpl_scale_plugin.la
 if HAVE_OSX
 libpl_scale_plugin_la_LIBADD += libvlc_opengl.la
 else
@@ -178,7 +178,7 @@ endif
 if HAVE_ANDROID
 libpl_scale_plugin_la_LIBADD += libvlc_opengles.la
 libpl_scale_plugin_la_CPPFLAGS += -DUSE_OPENGL_ES2=1
-video_filter_LTLIBRARIES += libpl_scale_plugin.la
+video_filter_PLUGINS += libpl_scale_plugin.la
 endif
 
 endif
@@ -188,7 +188,7 @@ libegl_display_generic_plugin_la_SOURCES = video_output/opengl/egl_display_gener
 libegl_display_generic_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(EGL_FLAGS)
 libegl_display_generic_plugin_la_LIBADD = $(EGL_LIBS)
 if HAVE_EGL
-vout_LTLIBRARIES += libegl_display_generic_plugin.la
+vout_PLUGINS += libegl_display_generic_plugin.la
 endif
 
 libegl_display_gbm_plugin_la_SOURCES = video_output/opengl/egl_display_gbm.c
@@ -200,7 +200,7 @@ libegl_display_gbm_plugin_la_CPPFLAGS += $(LIBDRM_CFLAGS) -DHAVE_KMS=1
 endif
 if HAVE_EGL
 if HAVE_GBM
-vout_LTLIBRARIES += libegl_display_gbm_plugin.la
+vout_PLUGINS += libegl_display_gbm_plugin.la
 endif
 endif
 
@@ -212,12 +212,12 @@ libegl_pbuffer_filter_plugin_la_LIBADD = $(EGL_LIBS)
 if HAVE_EGL
 if HAVE_GL
 libegl_pbuffer_filter_plugin_la_LIBADD += libvlc_opengl.la $(GL_LIBS)
-vout_LTLIBRARIES += libegl_pbuffer_filter_plugin.la
+vout_PLUGINS += libegl_pbuffer_filter_plugin.la
 endif
 if HAVE_ANDROID
 libegl_pbuffer_filter_plugin_la_LIBADD += libvlc_opengles.la $(GLES2_LIBS)
 libegl_pbuffer_filter_plugin_la_CPPFLAGS += -DUSE_OPENGL_ES2=1
-vout_LTLIBRARIES += libegl_pbuffer_filter_plugin.la
+vout_PLUGINS += libegl_pbuffer_filter_plugin.la
 endif
 endif
 
@@ -227,6 +227,6 @@ libegl_surfacetexture_plugin_la_LIBADD = $(EGL_LIBS) libandroid_utils.la libvlc_
 
 if HAVE_ANDROID
 if HAVE_EGL
-vout_LTLIBRARIES += libegl_surfacetexture_plugin.la
+vout_PLUGINS += libegl_surfacetexture_plugin.la
 endif
 endif

modules/video_output/vulkan/Makefile.am

@@ -17,10 +17,10 @@ libvk_android_plugin_la_CFLAGS = $(AM_CFLAGS) $(VULKAN_CFLAGS) \
 
 if HAVE_VULKAN
 if HAVE_WIN32_DESKTOP
-vout_LTLIBRARIES += libvk_win32_plugin.la
+vout_PLUGINS += libvk_win32_plugin.la
 endif
 
 if HAVE_ANDROID
-vout_LTLIBRARIES += libvk_android_plugin.la
+vout_PLUGINS += libvk_android_plugin.la
 endif
 endif

modules/video_output/wayland/Makefile.am

@@ -83,14 +83,14 @@ libvk_wl_plugin_la_LIBADD = $(WAYLAND_CLIENT_LIBS)
 
 if HAVE_WAYLAND
 BUILT_SOURCES += $(nodist_libwl_shm_plugin_la_SOURCES)
-vout_LTLIBRARIES += libwl_shm_plugin.la
-vout_LTLIBRARIES += libwl_shell_plugin.la
+vout_PLUGINS += libwl_shm_plugin.la
+vout_PLUGINS += libwl_shell_plugin.la
 BUILT_SOURCES += $(nodist_libxdg_shell_plugin_la_SOURCES)
-vout_LTLIBRARIES += libxdg_shell_plugin.la
+vout_PLUGINS += libxdg_shell_plugin.la
 if HAVE_EGL
-vout_LTLIBRARIES += libegl_wl_plugin.la
+vout_PLUGINS += libegl_wl_plugin.la
 endif
 if HAVE_VULKAN
-vout_LTLIBRARIES += libvk_wl_plugin.la
+vout_PLUGINS += libvk_wl_plugin.la
 endif
 endif

modules/video_output/xcb/Makefile.am

@@ -56,7 +56,7 @@ libglx_plugin_la_LIBADD = $(GL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
 
 if HAVE_XCB
 pkglib_LTLIBRARIES += libvlc_xcb_events.la
-vout_LTLIBRARIES += \
+vout_PLUGINS += \
 	libxcb_x11_plugin.la \
 	libxcb_render_plugin.la \
 	libxcb_window_plugin.la
@@ -67,12 +67,12 @@ libxcb_window_plugin_la_SOURCES += \
 libxcb_window_plugin_la_CFLAGS += -DHAVE_XKBCOMMON
 endif
 if HAVE_VULKAN
-vout_LTLIBRARIES += libvk_x11_plugin.la
+vout_PLUGINS += libvk_x11_plugin.la
 endif
 if HAVE_EGL
-vout_LTLIBRARIES += libxcb_egl_plugin.la libegl_x11_plugin.la
+vout_PLUGINS += libxcb_egl_plugin.la libegl_x11_plugin.la
 endif
 if HAVE_GL
-vout_LTLIBRARIES += libglx_plugin.la
+vout_PLUGINS += libglx_plugin.la
 endif
 endif

modules/video_splitter/Makefile.am

@@ -1,6 +1,14 @@
 splitterdir = $(pluginsdir)/video_splitter
+splitter_PLUGINS =
+splitter_LTLIBRARIES =
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(splitter_PLUGINS)
+else
+splitter_LTLIBRARIES += $(splitter_PLUGINS)
+endif
+
 
-splitter_LTLIBRARIES = \
+splitter_PLUGINS += \
 	libclone_plugin.la \
 	libwall_plugin.la
 
@@ -12,11 +20,11 @@ libpanoramix_plugin_la_SOURCES = video_splitter/panoramix.c
 libpanoramix_plugin_la_CFLAGS = $(AM_CFLAGS)
 libpanoramix_plugin_la_LIBADD = $(LIBM)
 if HAVE_WIN32_DESKTOP
-splitter_LTLIBRARIES += libpanoramix_plugin.la
+splitter_PLUGINS += libpanoramix_plugin.la
 else
 if HAVE_XCB
 libpanoramix_plugin_la_CFLAGS += $(XCB_RANDR_CFLAGS) $(XCB_CFLAGS)
 libpanoramix_plugin_la_LIBADD += $(XCB_RANDR_LIBS) $(XCB_LIBS)
-splitter_LTLIBRARIES += libpanoramix_plugin.la
+splitter_PLUGINS += libpanoramix_plugin.la
 endif
 endif

modules/visualization/Makefile.am

@@ -1,7 +1,14 @@
 visudir = $(pluginsdir)/visualization
+visu_PLUGINS =
 visu_LTLIBRARIES =
 visu_RPATH =
+
+if HAVE_MERGE_PLUGINS
+noinst_LTLIBRARIES += $(visu_PLUGINS)
+else
+visu_LTLIBRARIES += $(visu_PLUGINS)
 visu_RPATH += -rpath '$(visudir)'
+endif
 
 libglspectrum_plugin_la_SOURCES = \
 	visualization/glspectrum.c \
@@ -10,7 +17,7 @@ libglspectrum_plugin_la_SOURCES = \
 	visualization/visual/window_presets.h
 libglspectrum_plugin_la_LIBADD = $(GL_LIBS) $(LIBM)
 if HAVE_GL
-visu_LTLIBRARIES += libglspectrum_plugin.la
+visu_PLUGINS += libglspectrum_plugin.la
 endif
 
 libgoom_plugin_la_SOURCES = visualization/goom.c
@@ -18,14 +25,14 @@ libgoom_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(GOOM_CFLAGS)
 libgoom_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(visu_RPATH)
 libgoom_plugin_la_LIBADD = $(GOOM_LIBS) $(LIBM)
 EXTRA_LTLIBRARIES += libgoom_plugin.la
-visu_LTLIBRARIES += $(LTLIBgoom)
+visu_PLUGINS += $(LTLIBgoom)
 
 libprojectm_plugin_la_SOURCES = visualization/projectm.cpp
 libprojectm_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(PROJECTM_CFLAGS) -std=gnu++14
 libprojectm_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(visu_RPATH)
 libprojectm_plugin_la_LIBADD = $(PROJECTM_LIBS)
 EXTRA_LTLIBRARIES += libprojectm_plugin.la
-visu_LTLIBRARIES += $(LTLIBprojectm)
+visu_PLUGINS += $(LTLIBprojectm)
 
 libvisual_plugin_la_SOURCES = \
 	visualization/visual/visual.c visualization/visual/visual.h \
@@ -34,11 +41,11 @@ libvisual_plugin_la_SOURCES = \
 	visualization/visual/window.c visualization/visual/window.h \
 	visualization/visual/window_presets.h
 libvisual_plugin_la_LIBADD = $(LIBM)
-visu_LTLIBRARIES += libvisual_plugin.la
+visu_PLUGINS += libvisual_plugin.la
 
 libvsxu_plugin_la_SOURCES = visualization/vsxu.cpp visualization/cyclic_buffer.h
 libvsxu_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(VSXU_CFLAGS)
 libvsxu_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(visu_RPATH)
 libvsxu_plugin_la_LIBADD = $(VSXU_LIBS) $(LIBM)
 EXTRA_LTLIBRARIES += libvsxu_plugin.la
-visu_LTLIBRARIES += $(LTLIBvsxu)
+visu_PLUGINS += $(LTLIBvsxu)