From 98cea7a2a22ceedb3c6eebc4b4f3fb40d263ba09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sun, 15 Sep 2013 18:47:01 +0300
Subject: [PATCH] modules: remove VLC-specific AM_LIBADD, simplify
---
modules/Makefile.am | 2 +-
modules/access/Makefile.am | 90 ++++++++++++---------------
modules/access/rtp/Makefile.am | 2 +-
modules/access_output/Modules.am | 7 +--
modules/arm_neon/Makefile.am | 4 --
modules/audio_filter/Modules.am | 4 +-
modules/audio_mixer/Makefile.am | 6 +-
modules/audio_output/Modules.am | 33 +++-------
modules/codec/Modules.am | 17 +++--
modules/common.am | 3 +-
modules/control/Modules.am | 5 +-
modules/demux/Modules.am | 31 ++-------
modules/genmf | 2 +-
modules/gui/qt4/Makefile.am | 2 +-
modules/hw/vdpau/Makefile.am | 19 +++---
modules/misc/Modules.am | 19 ++----
modules/mux/Modules.am | 6 +-
modules/notify/Makefile.am | 4 +-
modules/services_discovery/Modules.am | 11 ++--
modules/stream_filter/Makefile.am | 6 +-
modules/stream_out/Modules.am | 8 +--
modules/video_chroma/Makefile.am | 6 +-
modules/video_filter/Modules.am | 8 +--
modules/video_output/Modules.am | 48 ++++++--------
modules/video_splitter/Makefile.am | 2 +-
modules/visualization/Modules.am | 2 +-
26 files changed, 123 insertions(+), 224 deletions(-)
diff --git a/modules/Makefile.am b/modules/Makefile.am
index d5008d9c338f..e78a91d78fa8 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -50,7 +50,7 @@ libvlc_pulse_la_SOURCES = vlcpulse.c vlcpulse.h
libvlc_pulse_la_CPPFLAGS = -DMODULE_STRING=\"pulse\"
libvlc_pulse_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
libvlc_pulse_la_LDFLAGS = -static
-libvlc_pulse_la_LIBADD = $(AM_LIBADD) $(PULSE_LIBS)
+libvlc_pulse_la_LIBADD = $(PULSE_LIBS)
if HAVE_PULSE
noinst_LTLIBRARIES += libvlc_pulse.la
endif
diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 8b9d23a4e44c..97b8ed0446bd 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -12,9 +12,8 @@ libattachment_plugin_la_SOURCES = attachment.c
access_LTLIBRARIES += libattachment_plugin.la
libfilesystem_plugin_la_SOURCES = fs.h file.c directory.c fs.c
-libfilesystem_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_WIN32
-libfilesystem_plugin_la_LIBADD += -lshlwapi
+libfilesystem_plugin_la_LIBADD = -lshlwapi
endif
access_LTLIBRARIES += libfilesystem_plugin.la
@@ -22,7 +21,7 @@ libidummy_plugin_la_SOURCES = idummy.c
access_LTLIBRARIES += libidummy_plugin.la
libimem_plugin_la_SOURCES = imem.c
-libimem_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
+libimem_plugin_la_LIBADD = $(LIBM)
access_LTLIBRARIES += libimem_plugin.la
librar_plugin_la_SOURCES = rar/rar.c rar/rar.h \
@@ -40,7 +39,7 @@ access_LTLIBRARIES += libvdr_plugin.la
libzip_plugin_la_SOURCES = zip/zip.h zip/zipstream.c zip/zipaccess.c
libzip_plugin_la_CFLAGS = $(AM_CFLAGS) $(MINIZIP_CFLAGS)
-libzip_plugin_la_LIBADD = $(AM_LIBADD) $(MINIZIP_LIBS)
+libzip_plugin_la_LIBADD = $(MINIZIP_LIBS)
libunzip_la_SOURCES = zip/unzip/unzip.c zip/unzip/unzip.h zip/unzip/crypt.h \
zip/unzip/ioapi.c zip/unzip/ioapi.h
libunzip_la_LIBADD = -lz
@@ -59,27 +58,27 @@ endif
libaccess_alsa_plugin_la_SOURCES = alsa.c
libaccess_alsa_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
-libaccess_alsa_plugin_la_LIBADD = $(AM_LIBADD) $(ALSA_LIBS)
+libaccess_alsa_plugin_la_LIBADD = $(ALSA_LIBS)
if HAVE_ALSA
access_LTLIBRARIES += libaccess_alsa_plugin.la
endif
libaccess_oss_plugin_la_SOURCES = oss.c
-libaccess_oss_plugin_la_LIBADD = $(AM_LIBADD) $(OSS_LIBS)
+libaccess_oss_plugin_la_LIBADD = $(OSS_LIBS)
if HAVE_OSS
access_LTLIBRARIES += libaccess_oss_plugin.la
endif
libaccess_jack_plugin_la_SOURCES = jack.c
libaccess_jack_plugin_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
-libaccess_jack_plugin_la_LIBADD = $(AM_LIBADD) $(JACK_LIBS)
+libaccess_jack_plugin_la_LIBADD = $(JACK_LIBS)
if HAVE_JACK
access_LTLIBRARIES += libaccess_jack_plugin.la
endif
libpulsesrc_plugin_la_SOURCES = pulse.c
libpulsesrc_plugin_la_CFLAGS= $(AM_CFLAGS) $(PULSE_CFLAGS)
-libpulsesrc_plugin_la_LIBADD = ../libvlc_pulse.la $(AM_LIBADD) $(PULSE_LIBS)
+libpulsesrc_plugin_la_LIBADD = ../libvlc_pulse.la $(PULSE_LIBS)
if HAVE_PULSE
access_LTLIBRARIES += libpulsesrc_plugin.la
endif
@@ -102,14 +101,14 @@ endif
libdc1394_plugin_la_SOURCES = dc1394.c
libdc1394_plugin_la_CFLAGS = $(AM_CFLAGS) $(DC1394_CFLAGS)
-libdc1394_plugin_la_LIBADD = $(AM_LIBADD) $(DC1394_LIBS)
+libdc1394_plugin_la_LIBADD = $(DC1394_LIBS)
libdc1394_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBdc1394)
EXTRA_LTLIBRARIES += libdc1394_plugin.la
libdv1394_plugin_la_SOURCES = dv.c
libdv1394_plugin_la_CFLAGS = $(AM_CFLAGS) $(DV1394_CFLAGS)
-libdv1394_plugin_la_LIBADD = $(AM_LIBADD) $(DV1394_LIBS)
+libdv1394_plugin_la_LIBADD = $(DV1394_LIBS)
libdv1394_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBdv1394)
EXTRA_LTLIBRARIES += libdv1394_plugin.la
@@ -121,20 +120,20 @@ liblinsys_hdsdi_plugin_la_SOURCES = \
liblinsys_hdsdi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
liblinsys_sdi_plugin_la_SOURCES = linsys/linsys_sdi.c linsys/linsys_sdi.h
liblinsys_sdi_plugin_la_CFLAGS = $(AM_CFLAGS) $(LINSYS_SDI_CFLAGS)
-liblinsys_sdi_plugin_la_LIBADD = $(AM_LIBADD) $(LINSYS_SDI_LIBS)
+liblinsys_sdi_plugin_la_LIBADD = $(LINSYS_SDI_LIBS)
liblinsys_sdi_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBlinsys_hdsdi) $(LTLIBlinsys_sdi)
EXTRA_LTLIBRARIES += liblinsys_hdsdi_plugin.la liblinsys_sdi_plugin.la
libdecklink_plugin_la_SOURCES = decklink.cpp
libdecklink_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklink)
-libdecklink_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_decklink) -ldl
+libdecklink_plugin_la_LIBADD = $(LIBS_decklink) -ldl
if HAVE_DECKLINK
access_LTLIBRARIES += libdecklink_plugin.la
endif
libshm_plugin_la_SOURCES = shm.c
-libshm_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
+libshm_plugin_la_LIBADD = $(LIBM)
if HAVE_WIN32
libshm_plugin_la_DEPENDENCIES = libshm_plugin.rc.o
endif
@@ -162,14 +161,14 @@ libv4l2_plugin_la_SOURCES = \
v4l2/v4l2.h
libv4l2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/v4l2
libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS) $(ZVBI_CFLAGS)
-libv4l2_plugin_la_LIBADD = $(AM_LIBADD) $(LIBDL) $(LIBM) $(ZVBI_LIBS)
+libv4l2_plugin_la_LIBADD = $(LIBDL) $(LIBM) $(ZVBI_LIBS)
if HAVE_V4L2
access_LTLIBRARIES += libv4l2_plugin.la
endif
libdshow_plugin_la_SOURCES = dshow/vlc_dshow.h dshow/dshow.cpp dshow/access.h \
dshow/filter.cpp dshow/filter.h dshow/crossbar.cpp
-libdshow_plugin_la_LIBADD = $(AM_LIBADD) -lole32 -loleaut32 -luuid -lstrmiids -lksuser
+libdshow_plugin_la_LIBADD = -lole32 -loleaut32 -luuid -lstrmiids -lksuser
if HAVE_WIN32
access_LTLIBRARIES += libdshow_plugin.la
libdshow_plugin_la_DEPENDENCIES = libdshow_plugin.rc.o
@@ -181,38 +180,35 @@ endif
libxcb_screen_plugin_la_SOURCES = screen/xcb.c
libxcb_screen_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(XCB_COMPOSITE_CFLAGS) $(XCB_SHM_CFLAGS)
-libxcb_screen_plugin_la_LIBADD = $(AM_LIBADD) \
- $(XCB_LIBS) $(XCB_COMPOSITE_LIBS) $(XCB_SHM_LIBS)
+libxcb_screen_plugin_la_LIBADD = $(XCB_LIBS) $(XCB_COMPOSITE_LIBS) $(XCB_SHM_LIBS)
if HAVE_XCB
access_LTLIBRARIES += libxcb_screen_plugin.la
endif
libscreen_plugin_la_SOURCES = screen/screen.c screen/screen.h
-libscreen_plugin_la_LIBADD = $(AM_LIBADD)
+libscreen_plugin_la_LDFLAGS = $(AM_LDFLAGS)
if HAVE_WIN32
libscreen_plugin_la_SOURCES += screen/win32.c
-libscreen_plugin_la_LDFLAGS = $(AM_LDFLAGS)
-libscreen_plugin_la_LIBADD += -lgdi32
+libscreen_plugin_la_LIBADD = -lgdi32
access_LTLIBRARIES += libscreen_plugin.la
libscreen_plugin_la_DEPENDENCIES = libscreen_plugin.rc.o
endif
if HAVE_MAC_SCREEN
libscreen_plugin_la_SOURCES += screen/mac.c
-libscreen_plugin_la_LDFLAGS = $(AM_LDFLAGS)
libscreen_plugin_la_LDFLAGS += "-Wl,-framework,OpenGL,-framework,ApplicationServices"
access_LTLIBRARIES += libscreen_plugin.la
endif
librdp_plugin_la_SOURCES = rdp.c
librdp_plugin_la_CFLAGS = $(AM_CFLAGS) $(FREERDP_CFLAGSp)
-librdp_plugin_la_LIBADD = $(AM_LIBADD) $(FREERDP_LIBS)
+librdp_plugin_la_LIBADD = $(FREERDP_LIBS)
librdp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBrdp)
EXTRA_LTLIBRARIES += librdp_plugin.la
libvnc_plugin_la_SOURCES = vnc.c
libvnc_plugin_la_CFLAGS = $(AM_CFLAGS) $(VNC_CFLAGS)
-libvnc_plugin_la_LIBADD = $(AM_LIBADD) $(VNC_LIBS)
+libvnc_plugin_la_LIBADD = $(VNC_LIBS)
libvnc_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBvnc)
EXTRA_LTLIBRARIES += libvnc_plugin.la
@@ -221,18 +217,16 @@ EXTRA_LTLIBRARIES += libvnc_plugin.la
### Optical media ###
libcdda_plugin_la_SOURCES = cdda.c vcd/cdrom.c vcd/cdrom.h vcd/cdrom_internals.h
-libcdda_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_DARWIN
-libcdda_plugin_la_LIBADD += -liconv
+libcdda_plugin_la_LIBADD = -liconv
endif
libcdda_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
EXTRA_LTLIBRARIES += libcdda_plugin.la
access_LTLIBRARIES += $(LTLIBcdda)
libvcd_plugin_la_SOURCES = vcd/vcd.c vcd/cdrom.c vcd/cdrom.h vcd/cdrom_internals.h
-libvcd_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_DARWIN
-libvcd_plugin_la_LIBADD += -liconv
+libvcd_plugin_la_LIBADD = -liconv
endif
libvcd_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
EXTRA_LTLIBRARIES += libvcd_plugin.la
@@ -244,9 +238,8 @@ libvcdx_plugin_la_SOURCES = \
vcdx/vcdplayer.h vcdx/vcdplayer.c \
vcdx/info.c vcdx/info.h
libvcdx_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
-libvcdx_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_WIN32
-libvcdx_plugin_la_LIBADD += -lwinmm
+libvcdx_plugin_la_LIBADD = -lwinmm
endif
libvcdx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
EXTRA_LTLIBRARIES += libvcdx_plugin.la
@@ -254,27 +247,26 @@ access_LTLIBRARIES += $(LTLIBvcdx)
libdvdnav_plugin_la_SOURCES = dvdnav.c
libdvdnav_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS)
-libdvdnav_plugin_la_LIBADD = $(AM_LIBADD) $(DVDNAV_LIBS)
+libdvdnav_plugin_la_LIBADD = $(DVDNAV_LIBS)
libdvdnav_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBdvdnav)
EXTRA_LTLIBRARIES += libdvdnav_plugin.la
libdvdread_plugin_la_SOURCES = dvdread.c
libdvdread_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVDREAD_CFLAGS)
-libdvdread_plugin_la_LIBADD = $(AM_LIBADD) $(DVDREAD_LIBS)
+libdvdread_plugin_la_LIBADD = $(DVDREAD_LIBS)
libdvdread_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBdvdread)
EXTRA_LTLIBRARIES += libdvdread_plugin.la
liblibbluray_plugin_la_SOURCES = bluray.c
liblibbluray_plugin_la_CFLAGS = $(AM_CFLAGS) $(BLURAY_CFLAGS)
-liblibbluray_plugin_la_LIBADD = $(AM_LIBADD) $(BLURAY_LIBS)
+liblibbluray_plugin_la_LIBADD = $(BLURAY_LIBS)
liblibbluray_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBlibbluray)
EXTRA_LTLIBRARIES += liblibbluray_plugin.la
libaccess_bd_plugin_la_SOURCES = bd/bd.c bd/mpls.c bd/mpls.h bd/clpi.c bd/clpi.h
-libaccess_bd_plugin_la_LIBADD = $(AM_LIBADD)
access_LTLIBRARIES += libaccess_bd_plugin.la
if HAVE_WIN32
libaccess_bd_plugin_la_DEPENDENCIES = libaccess_bd_plugin.rc.o
@@ -287,7 +279,6 @@ libdtv_plugin_la_SOURCES = \
dtv/dtv.h \
dtv/access.c
libdtv_plugin_la_CFLAGS = $(AM_CFLAGS)
-libdtv_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_LINUX_DVB
libdtv_plugin_la_SOURCES += dtv/linux.c
@@ -295,7 +286,7 @@ libdtv_plugin_la_CFLAGS += -DHAVE_LINUX_DVB
if HAVE_DVBPSI
libdtv_plugin_la_SOURCES += dtv/en50221.c dtv/en50221.h ../mux/mpeg/dvbpsi_compat.h
libdtv_plugin_la_CFLAGS += -DHAVE_DVBPSI $(DVBPSI_CFLAGS)
-libdtv_plugin_la_LIBADD += $(DVBPSI_LIBS)
+libdtv_plugin_la_LIBADD = $(DVBPSI_LIBS)
endif
access_LTLIBRARIES += libdtv_plugin.la
endif
@@ -309,7 +300,7 @@ libbda_la_LIBADD = -lstrmiids -lole32 -loleaut32 -luuid
noinst_LTLIBRARIES += libbda.la
libdtv_plugin_la_DEPENDENCIES = libbda.la libdtv_plugin.rc.o
-libdtv_plugin_la_LIBADD += libbda.la -lstdc++
+libdtv_plugin_la_LIBADD = libbda.la -lstdc++
access_LTLIBRARIES += libdtv_plugin.la
endif
@@ -320,13 +311,12 @@ libdvb_plugin_la_SOURCES = \
dvb/scan.c dvb/scan.h \
dvb/dvb.h
libdvb_plugin_la_CFLAGS = $(AM_CFLAGS)
-libdvb_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_LINUX_DVB
if HAVE_DVBPSI
libdvb_plugin_la_SOURCES += ../mux/mpeg/dvbpsi_compat.h
access_LTLIBRARIES += libdvb_plugin.la
libdvb_plugin_la_CFLAGS += $(DVBPSI_CFLAGS)
-libdvb_plugin_la_LIBADD += $(DVBPSI_LIBS)
+libdvb_plugin_la_LIBADD = $(DVBPSI_LIBS)
endif
endif
@@ -340,11 +330,11 @@ EXTRA_LTLIBRARIES += libaccess_eyetv_plugin.la
### Network streams ###
libftp_plugin_la_SOURCES = ftp.c
-libftp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libftp_plugin_la_LIBADD = $(SOCKET_LIBS)
access_LTLIBRARIES += libftp_plugin.la
libhttp_plugin_la_SOURCES = http.c
-libhttp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libhttp_plugin_la_LIBADD = $(SOCKET_LIBS)
if HAVE_ZLIB
libhttp_plugin_la_LIBADD += -lz
endif
@@ -352,7 +342,7 @@ access_LTLIBRARIES += libhttp_plugin.la
liblive555_plugin_la_SOURCES = live555.cpp mms/asf.c mms/buffer.c
liblive555_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(CXXFLAGS_live555)
-liblive555_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_live555)
+liblive555_plugin_la_LIBADD = $(LIBS_live555)
liblive555_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)' \
$(LDFLAGS_live555)
access_LTLIBRARIES += $(LTLIBlive555)
@@ -366,12 +356,12 @@ libaccess_mms_plugin_la_SOURCES = \
mms/asf.h mms/asf.c \
../demux/asf/libasf_guid.h
libaccess_mms_plugin_la_CFLAGS = $(AM_CFLAGS)
-libaccess_mms_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libaccess_mms_plugin_la_LIBADD = $(SOCKET_LIBS)
access_LTLIBRARIES += libaccess_mms_plugin.la
libsmb_plugin_la_SOURCES = smb.c
libsmb_plugin_la_CFLAGS = $(AM_CFLAGS) $(SMBCLIENT_CFLAGS)
-libsmb_plugin_la_LIBADD = $(AM_LIBADD) $(SMBCLIENT_LIBS)
+libsmb_plugin_la_LIBADD = $(SMBCLIENT_LIBS)
if HAVE_WIN32
libsmb_plugin_la_LIBADD += -lmpr
endif
@@ -380,16 +370,16 @@ access_LTLIBRARIES += $(LTLIBsmb)
EXTRA_LTLIBRARIES += libsmb_plugin.la
libtcp_plugin_la_SOURCES = tcp.c
-libtcp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libtcp_plugin_la_LIBADD = $(SOCKET_LIBS)
access_LTLIBRARIES += libtcp_plugin.la
libudp_plugin_la_SOURCES = udp.c
-libudp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libudp_plugin_la_LIBADD = $(SOCKET_LIBS)
access_LTLIBRARIES += libudp_plugin.la
libsftp_plugin_la_SOURCES = sftp.c
libsftp_plugin_la_CFLAGS = $(AM_CFLAGS) $(SFTP_CFLAGS)
-libsftp_plugin_la_LIBADD = $(AM_LIBADD) $(SFTP_LIBS)
+libsftp_plugin_la_LIBADD = $(SFTP_LIBS)
libsftp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBsftp)
EXTRA_LTLIBRARIES += libsftp_plugin.la
@@ -401,7 +391,7 @@ libaccess_realrtsp_plugin_la_SOURCES = \
rtsp/real_rmff.c rtsp/real_rmff.h \
rtsp/real_sdpplin.c rtsp/real_sdpplin.h \
rtsp/real_asmrp.c
-libaccess_realrtsp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libaccess_realrtsp_plugin_la_LIBADD = $(SOCKET_LIBS)
libaccess_realrtsp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBaccess_realrtsp)
EXTRA_LTLIBRARIES += libaccess_realrtsp_plugin.la
@@ -409,7 +399,7 @@ EXTRA_LTLIBRARIES += libaccess_realrtsp_plugin.la
libavio_plugin_la_SOURCES = avio.c avio.h ../codec/avcodec/cpu.c
libavio_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS)
libavio_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS)
-libavio_plugin_la_LIBADD = $(AM_LIBADD) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM)
+libavio_plugin_la_LIBADD = $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM)
if HAVE_AVFORMAT
access_LTLIBRARIES += libavio_plugin.la
endif
@@ -419,14 +409,14 @@ endif
libgnomevfs_plugin_la_SOURCES = gnomevfs.c
libgnomevfs_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNOMEVFS_CFLAGS)
-libgnomevfs_plugin_la_LIBADD = $(AM_LIBADD) $(GNOMEVFS_LIBS)
+libgnomevfs_plugin_la_LIBADD = $(GNOMEVFS_LIBS)
libgnomevfs_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBgnomevfs)
EXTRA_LTLIBRARIES += libgnomevfs_plugin.la
libaccess_mtp_plugin_la_SOURCES = mtp.c
libaccess_mtp_plugin_la_CFLAGS = $(AM_CFLAGS) $(MTP_CFLAGS)
-libaccess_mtp_plugin_la_LIBADD = $(AM_LIBADD) $(MTP_LIBS)
+libaccess_mtp_plugin_la_LIBADD = $(MTP_LIBS)
libaccess_mtp_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
access_LTLIBRARIES += $(LTLIBaccess_mtp)
EXTRA_LTLIBRARIES += libaccess_mtp_plugin.la
diff --git a/modules/access/rtp/Makefile.am b/modules/access/rtp/Makefile.am
index 332bce730ca3..e34432997427 100644
--- a/modules/access/rtp/Makefile.am
+++ b/modules/access/rtp/Makefile.am
@@ -10,7 +10,7 @@ librtp_plugin_la_SOURCES = \
session.c \
xiph.c
librtp_plugin_la_CFLAGS = $(AM_CFLAGS)
-librtp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+librtp_plugin_la_LIBADD = $(SOCKET_LIBS)
# Secure RTP library
libvlc_srtp_la_SOURCES = srtp.c
diff --git a/modules/access_output/Modules.am b/modules/access_output/Modules.am
index db64fbc65ff8..b6ea5cc92bef 100644
--- a/modules/access_output/Modules.am
+++ b/modules/access_output/Modules.am
@@ -11,12 +11,9 @@ access_output_LTLIBRARIES += \
libaccess_output_http_plugin.la \
$(NULL)
-if HAVE_GCRYPT
libaccess_output_livehttp_plugin_la_SOURCES = livehttp.c
libaccess_output_livehttp_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
-libaccess_output_livehttp_plugin_la_LIBADD = $(AM_LIBADD) $(GCRYPT_LIBS) -lgpg-error
-if HAVE_WIN32
-libaccess_output_livehttp_plugin_la_DEPENDENCIES = libaccess_output_livehttp_plugin.rc.o
-endif
+libaccess_output_livehttp_plugin_la_LIBADD = $(GCRYPT_LIBS) -lgpg-error
+if HAVE_GCRYPT
access_output_LTLIBRARIES += libaccess_output_livehttp_plugin.la
endif
diff --git a/modules/arm_neon/Makefile.am b/modules/arm_neon/Makefile.am
index 70c030710d44..ff34b464d6db 100644
--- a/modules/arm_neon/Makefile.am
+++ b/modules/arm_neon/Makefile.am
@@ -6,7 +6,6 @@ libsimple_channel_mixer_neon_plugin_la_SOURCES = \
simple_channel_mixer.S \
simple_channel_mixer.c
libsimple_channel_mixer_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
-libsimple_channel_mixer_neon_plugin_la_LIBADD = $(AM_LIBADD)
libsimple_channel_mixer_neon_plugin_la_DEPENDENCIES =
libchroma_yuv_neon_plugin_la_SOURCES = \
@@ -15,11 +14,9 @@ libchroma_yuv_neon_plugin_la_SOURCES = \
yuyv_i422.S \
chroma_yuv.c chroma_neon.h
libchroma_yuv_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
-libchroma_yuv_neon_plugin_la_LIBADD = $(AM_LIBADD)
libvolume_neon_plugin_la_SOURCES = volume.c amplify.S
libvolume_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
-libvolume_neon_plugin_la_LIBADD = $(AM_LIBADD)
libyuv_rgb_neon_plugin_la_SOURCES = \
i420_rgb.S \
@@ -28,7 +25,6 @@ libyuv_rgb_neon_plugin_la_SOURCES = \
nv12_rgb.S \
yuv_rgb.c
libyuv_rgb_neon_plugin_la_CFLAGS = $(AM_CFLAGS)
-libyuv_rgb_neon_plugin_la_LIBADD = $(AM_LIBADD)
neon_LTLIBRARIES = \
libsimple_channel_mixer_neon_plugin.la \
diff --git a/modules/audio_filter/Modules.am b/modules/audio_filter/Modules.am
index afaee5c8a3a6..25d2df2fb769 100644
--- a/modules/audio_filter/Modules.am
+++ b/modules/audio_filter/Modules.am
@@ -52,7 +52,7 @@ SOURCES_dtstospdif = converter/dtstospdif.c
SOURCES_dtstofloat32 = converter/dtstofloat32.c
SOURCES_mpgatofixed32 = converter/mpgatofixed32.c
libaudio_format_plugin_la_SOURCES = converter/format.c
-libaudio_format_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
+libaudio_format_plugin_la_LIBADD = $(LIBM)
audio_filter_LTLIBRARIES += \
liba52tospdif_plugin.la \
@@ -72,7 +72,7 @@ EXTRA_LTLIBRARIES += \
libspeex_resampler_plugin_la_SOURCES = resampler/speex.c
libspeex_resampler_plugin_la_CFLAGS = $(AM_CFLAGS) $(SPEEXDSP_CFLAGS)
-libspeex_resampler_plugin_la_LIBADD = $(AM_LIBADD) $(SPEEXDSP_LIBS)
+libspeex_resampler_plugin_la_LIBADD = $(SPEEXDSP_LIBS)
if HAVE_WIN32
libspeex_resampler_plugin_la_DEPENDENCIES = libspeex_resampler_plugin.rc.o
endif
diff --git a/modules/audio_mixer/Makefile.am b/modules/audio_mixer/Makefile.am
index 98e7e15012ae..f018a4c907a3 100644
--- a/modules/audio_mixer/Makefile.am
+++ b/modules/audio_mixer/Makefile.am
@@ -2,16 +2,12 @@ include $(top_srcdir)/modules/common.am
audio_mixerdir = $(pluginsdir)/audio_mixer
libfloat_mixer_plugin_la_SOURCES = float.c
-libfloat_mixer_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
+libfloat_mixer_plugin_la_LIBADD = $(LIBM)
if HAVE_WIN32
libfloat_mixer_plugin_la_DEPENDENCIES = libfloat_mixer_plugin.rc.o
endif
libinteger_mixer_plugin_la_SOURCES = integer.c
-libinteger_mixer_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libinteger_mixer_plugin_la_DEPENDENCIES = libinteger_mixer_plugin.rc.o
-endif
audio_mixer_LTLIBRARIES = \
libfloat_mixer_plugin.la \
diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am
index 56f6a8b74b79..a0ca52e121c1 100644
--- a/modules/audio_output/Modules.am
+++ b/modules/audio_output/Modules.am
@@ -7,32 +7,20 @@ SOURCES_audiounit_ios = TPCircularBuffer.h TPCircularBuffer.c audiounit_ios.c
SOURCES_audioqueue = audioqueue.c
libopensles_android_plugin_la_SOURCES = opensles_android.c
-libopensles_android_plugin_la_LIBADD = $(AM_LIBADD) -ldl -lm
+libopensles_android_plugin_la_LIBADD = $(LIBDL) $(LIBM)
libandroid_audiotrack_plugin_la_SOURCES = audiotrack.c
-libandroid_audiotrack_plugin_la_LIBADD = $(AM_LIBADD) -ldl
+libandroid_audiotrack_plugin_la_LIBADD = $(LIBDL)
if HAVE_ANDROID
aout_LTLIBRARIES += libandroid_audiotrack_plugin.la libopensles_android_plugin.la
endif
libadummy_plugin_la_SOURCES = adummy.c
-libadummy_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libadummy_plugin_la_DEPENDENCIES = libadummy_plugin.rc.o
-endif
libafile_plugin_la_SOURCES = file.c
-libafile_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libafile_plugin_la_DEPENDENCIES = libafile_plugin.rc.o
-endif
libamem_plugin_la_SOURCES = amem.c
-libamem_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libamem_plugin_la_DEPENDENCIES = libamem_plugin.rc.o
-endif
aout_LTLIBRARIES += \
libadummy_plugin.la \
@@ -40,35 +28,34 @@ aout_LTLIBRARIES += \
libamem_plugin.la
liboss_plugin_la_SOURCES = oss.c volume.h
-liboss_plugin_la_LIBADD = $(AM_LIBADD) $(OSS_LIBS) $(LIBM)
+liboss_plugin_la_LIBADD = $(OSS_LIBS) $(LIBM)
if HAVE_OSS
aout_LTLIBRARIES += liboss_plugin.la
endif
libalsa_plugin_la_SOURCES = alsa.c volume.h
libalsa_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
-libalsa_plugin_la_LIBADD = $(AM_LIBADD) $(ALSA_LIBS) $(LIBM)
+libalsa_plugin_la_LIBADD = $(ALSA_LIBS) $(LIBM)
if HAVE_ALSA
aout_LTLIBRARIES += libalsa_plugin.la
endif
libpulse_plugin_la_SOURCES = pulse.c
libpulse_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
-libpulse_plugin_la_LIBADD = ../libvlc_pulse.la \
- $(AM_LIBADD) $(PULSE_LIBS) $(LIBM)
+libpulse_plugin_la_LIBADD = ../libvlc_pulse.la $(PULSE_LIBS) $(LIBM)
if HAVE_PULSE
aout_LTLIBRARIES += libpulse_plugin.la
endif
libjack_plugin_la_SOURCES = jack.c volume.h
libjack_plugin_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS)
-libjack_plugin_la_LIBADD = $(AM_LIBADD) $(JACK_LIBS) $(LIBM)
+libjack_plugin_la_LIBADD = $(JACK_LIBS) $(LIBM)
if HAVE_JACK
aout_LTLIBRARIES += libjack_plugin.la
endif
libmmdevice_plugin_la_SOURCES = mmdevice.c mmdevice.h wasapi.c
-libmmdevice_plugin_la_LIBADD = $(AM_LIBADD) -lole32 -lksuser
+libmmdevice_plugin_la_LIBADD = -lole32 -lksuser
if HAVE_WIN32
libmmdevice_plugin_la_DEPENDENCIES = libmmdevice_plugin.rc.o
endif
@@ -77,7 +64,7 @@ aout_LTLIBRARIES += libmmdevice_plugin.la
endif
libdirectsound_plugin_la_SOURCES = directx.c windows_audio_common.h
-libdirectsound_plugin_la_LIBADD = $(AM_LIBADD) -lole32
+libdirectsound_plugin_la_LIBADD = -lole32
if HAVE_WIN32
libdirectsound_plugin_la_DEPENDENCIES = libdirectsound_plugin.rc.o
endif
@@ -86,13 +73,13 @@ aout_LTLIBRARIES += libdirectsound_plugin.la
endif
libkai_plugin_la_SOURCES = kai.c
-libkai_plugin_la_LIBADD = $(AM_LIBADD) $(KAI_LIBS)
+libkai_plugin_la_LIBADD = $(KAI_LIBS)
if HAVE_KAI
aout_LTLIBRARIES += libkai_plugin.la
endif
libsndio_plugin_la_SOURCES = sndio.c
-libsndio_plugin_la_LIBADD = $(AM_LIBADD) -lsndio
+libsndio_plugin_la_LIBADD = -lsndio
if HAVE_SNDIO
aout_LTLIBRARIES += libsndio_plugin.la
endif
diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am
index 73ad7636c3b9..af6fe32c11b6 100644
--- a/modules/codec/Modules.am
+++ b/modules/codec/Modules.am
@@ -84,7 +84,7 @@ libaes3_plugin_la_SOURCES = aes3.c
libaraw_plugin_la_SOURCES = araw.c
libdts_plugin_la_SOURCES = dts.c
-libdts_plugin_la_LIBADD = libvlc_dts_header.la $(AM_LIBADD)
+libdts_plugin_la_LIBADD = libvlc_dts_header.la
libvlc_dts_header_la_SOURCES = dts_header.c dts_header.h
libvlc_dts_header_la_LDFLAGS = -static
@@ -125,7 +125,7 @@ if ENABLE_SOUT
libavcodec_plugin_la_SOURCES += avcodec/encoder.c
endif
libavcodec_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVCODEC_CFLAGS)
-libavcodec_plugin_la_LIBADD = $(AM_LIBADD) $(AVCODEC_LIBS) $(LIBM)
+libavcodec_plugin_la_LIBADD = $(AVCODEC_LIBS) $(LIBM)
libavcodec_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS)
if HAVE_WIN32
libavcodec_plugin_la_DEPENDENCIES = libavcodec_plugin.rc.o
@@ -154,8 +154,7 @@ libvaapi_plugin_la_SOURCES = \
avcodec/vaapi.c
libvaapi_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(LIBVA_CFLAGS) $(X_CFLAGS) $(AVCODEC_CFLAGS)
-libvaapi_plugin_la_LIBADD = $(AM_LIBADD) \
- $(LIBVA_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
+libvaapi_plugin_la_LIBADD = $(LIBVA_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
if HAVE_AVCODEC_VAAPI
codec_LTLIBRARIES += libvaapi_plugin.la
endif
@@ -163,7 +162,7 @@ endif
libdxva2_plugin_la_SOURCES = \
avcodec/copy.c avcodec/copy.h \
avcodec/dxva2.c
-libdxva2_plugin_la_LIBADD = $(AM_LIBADD) -lole32 -lshlwapi -luuid
+libdxva2_plugin_la_LIBADD = -lole32 -lshlwapi -luuid
if HAVE_AVCODEC_DXVA2
codec_LTLIBRARIES += libdxva2_plugin.la
endif
@@ -180,7 +179,7 @@ endif
libhwdummy_plugin_la_SOURCES = avcodec/hwdummy.c
libhwdummy_plugin_la_CFLAGS = $(AM_CFLAGS) $(VDPAU_CFLAGS) $(AVCODEC_CFLAGS)
-libhwdummy_plugin_la_LIBADD = $(AM_LIBADD) $(AVCODEC_LIBS)
+libhwdummy_plugin_la_LIBADD = $(AVCODEC_LIBS)
# FIXME: hwdummy only needs libavutil, and only if avcodec < 55.13.0
if HAVE_AVCODEC_VDPAU
codec_LTLIBRARIES += libhwdummy_plugin.la
@@ -192,7 +191,7 @@ endif
### XWD ###
libxwd_plugin_la_SOURCES = xwd.c
libxwd_plugin_la_CFLAGS = $(AM_CFLAGS) $(XPROTO_CFLAGS)
-libxwd_plugin_la_LIBADD = $(AM_LIBADD) $(XPROTO_LIBS)
+libxwd_plugin_la_LIBADD = $(XPROTO_LIBS)
libxwd_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
codec_LTLIBRARIES += $(LTLIBxwd)
EXTRA_LTLIBRARIES += libxwd_plugin.la
@@ -216,12 +215,12 @@ libomxil_plugin_la_SOURCES = \
omxil/qcom.c omxil/qcom.h \
omxil/omxil.c omxil/omxil.h omxil/omxil_core.c omxil/omxil_core.h
libomxil_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/omxil $(CFLAGS_omxil)
-libomxil_plugin_la_LIBADD = $(AM_LIBADD) $(LIBDL)
+libomxil_plugin_la_LIBADD = $(LIBDL)
libomxil_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
libomxil_vout_plugin_la_SOURCES = omxil/vout.c omxil/omxil_core.c omxil/utils.c omxil/qcom.c
libomxil_vout_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/omxil $(CFLAGS_omxil_vout)
-libomxil_vout_plugin_la_LIBADD = $(AM_LIBADD) $(LIBDL)
+libomxil_vout_plugin_la_LIBADD = $(LIBDL)
libomxil_vout_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
libiomx_plugin_la_SOURCES = $(libomxil_plugin_la_SOURCES)
diff --git a/modules/common.am b/modules/common.am
index b5b4cbeb7ae0..d941fa69ebb4 100644
--- a/modules/common.am
+++ b/modules/common.am
@@ -26,13 +26,12 @@ endif
AM_CFLAGS =
AM_CXXFLAGS =
AM_OBJCFLAGS =
-AM_LIBADD = $(LIBPTHREAD)
AM_LDFLAGS = \
-avoid-version -module \
-export-symbols-regex ^vlc_entry \
-shrext $(LIBEXT) \
-no-undefined \
- $(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la
+ $(LTLIBVLCCORE) $(top_builddir)/compat/libcompat.la $(LIBPTHREAD)
if HAVE_WIN32
AM_LDFLAGS += -Wl,lib$(MODULE_NAME)_plugin.rc.$(OBJEXT)
diff --git a/modules/control/Modules.am b/modules/control/Modules.am
index 5927393601bc..a13fdc2d7693 100644
--- a/modules/control/Modules.am
+++ b/modules/control/Modules.am
@@ -37,7 +37,7 @@ libdbus_plugin_la_SOURCES = \
dbus/dbus_tracklist.c dbus/dbus_tracklist.h \
dbus/dbus.c
libdbus_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
-libdbus_plugin_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) $(LIBM)
+libdbus_plugin_la_LIBADD = $(DBUS_LIBS) $(LIBM)
if HAVE_DBUS
control_LTLIBRARIES += libdbus_plugin.la
endif
@@ -45,13 +45,12 @@ endif
libxcb_hotkeys_plugin_la_SOURCES = globalhotkeys/xcb.c
libxcb_hotkeys_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_KEYSYMS_CFLAGS) $(XCB_CFLAGS)
-libxcb_hotkeys_plugin_la_LIBADD = $(AM_LIBADD) $(XCB_KEYSYMS_LIBS) $(XCB_LIBS)
+libxcb_hotkeys_plugin_la_LIBADD = $(XCB_KEYSYMS_LIBS) $(XCB_LIBS)
libxcb_hotkeys_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(controldir)'
EXTRA_LTLIBRARIES += libxcb_hotkeys_plugin.la
control_LTLIBRARIES += $(LTLIBxcb_hotkeys)
libwin_hotkeys_plugin_la_SOURCES = globalhotkeys/win32.c
-libwin_hotkeys_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_WIN32
control_LTLIBRARIES += libwin_hotkeys_plugin.la
endif
diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index 248d6f662497..ac38fd7d7f82 100644
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -32,16 +32,8 @@ SOURCES_image = image.c mxpeg_helper.h
SOURCES_demux_stl = stl.c
libasf_plugin_la_SOURCES = asf/asf.c asf/libasf.c asf/libasf.h asf/libasf_guid.h
-libasf_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libasf_plugin_la_DEPENDENCIES = libasf_plugin.rc.o
-endif
libavi_plugin_la_SOURCES = avi/avi.c avi/libavi.c avi/libavi.h
-libavi_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libavi_plugin_la_DEPENDENCIES = libavi_plugin.rc.o
-endif
libavformat_plugin_la_SOURCES = avformat/demux.c \
../codec/avcodec/fourcc.c \
@@ -55,8 +47,7 @@ if ENABLE_SOUT
libavformat_plugin_la_SOURCES += avformat/mux.c
endif
libavformat_plugin_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVUTIL_CFLAGS)
-libavformat_plugin_la_LIBADD = $(AM_LIBADD) $(AVFORMAT_LIBS) $(AVUTIL_LIBS) \
- $(LIBM)
+libavformat_plugin_la_LIBADD = $(AVFORMAT_LIBS) $(AVUTIL_LIBS) $(LIBM)
libavformat_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(SYMBOLIC_LDFLAGS)
if HAVE_ZLIB
libavformat_plugin_la_LIBADD += -lz
@@ -72,16 +63,12 @@ demux_LTLIBRARIES += libavformat_plugin.la
endif
libes_plugin_la_SOURCES = mpeg/es.c
-libes_plugin_la_LIBADD = ../codec/libvlc_dts_header.la $(AM_LIBADD)
+libes_plugin_la_LIBADD = ../codec/libvlc_dts_header.la
if HAVE_WIN32
libes_plugin_la_DEPENDENCIES = libes_plugin.rc.o
endif
libh264_plugin_la_SOURCES = mpeg/h264.c
-libh264_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libh264_plugin_la_DEPENDENCIES = libh264_plugin.rc.o
-endif
libmkv_plugin_la_SOURCES = \
mkv/util.hpp mkv/util.cpp \
@@ -97,7 +84,7 @@ libmkv_plugin_la_SOURCES = \
mkv/mkv.hpp mkv/mkv.cpp
libmkv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
libmkv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(demuxdir)'
-libmkv_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_mkv)
+libmkv_plugin_la_LIBADD = $(LIBS_mkv)
if HAVE_ZLIB
libmkv_plugin_la_LIBADD += -lz
endif
@@ -105,7 +92,7 @@ demux_LTLIBRARIES += $(LTLIBmkv)
EXTRA_LTLIBRARIES += libmkv_plugin.la
libmp4_plugin_la_SOURCES = mp4/mp4.c mp4/libmp4.c mp4/libmp4.h mp4/id3genres.h
-libmp4_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
+libmp4_plugin_la_LIBADD = $(LIBM)
libmp4_plugin_la_LDFLAGS = $(AM_LDFLAGS)
if HAVE_ZLIB
libmp4_plugin_la_LIBADD += -lz
@@ -115,10 +102,6 @@ libmp4_plugin_la_DEPENDENCIES = libmp4_plugin.rc.o
endif
libmpgv_plugin_la_SOURCES = mpeg/mpgv.c
-libmpgv_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libmpgv_plugin_la_DEPENDENCIES = libmpgv_plugin.rc.o
-endif
libplaylist_plugin_la_SOURCES = \
playlist/asx.c \
@@ -139,14 +122,10 @@ libplaylist_plugin_la_SOURCES = \
playlist/xspf.c \
playlist/zpl.c \
playlist/playlist.c playlist/playlist.h
-libplaylist_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libplaylist_plugin_la_DEPENDENCIES = libplaylist_plugin.rc.o
-endif
libts_plugin_la_SOURCES = ts.c ../mux/mpeg/csa.c ../mux/mpeg/dvbpsi_compat.h dvb-text.h
libts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS)
-libts_plugin_la_LIBADD = $(AM_LIBADD) $(DVBPSI_LIBS) $(SOCKET_LIBS)
+libts_plugin_la_LIBADD = $(DVBPSI_LIBS) $(SOCKET_LIBS)
if HAVE_WIN32
libts_plugin_la_DEPENDENCIES = libts_plugin.rc.o
endif
diff --git a/modules/genmf b/modules/genmf
index e5df90cc8589..be9799003108 100755
--- a/modules/genmf
+++ b/modules/genmf
@@ -49,7 +49,7 @@ lib${mod}_plugin_la_CPPFLAGS = \$(AM_CPPFLAGS) \$(CPPFLAGS_${mod}) \
lib${mod}_plugin_la_CFLAGS = \$(AM_CFLAGS) \$(CFLAGS_${mod})
lib${mod}_plugin_la_CXXFLAGS = \$(AM_CXXFLAGS) \$(CXXFLAGS_${mod})
lib${mod}_plugin_la_OBJCFLAGS = \$(AM_OBJCFLAGS) \$(OBJCFLAGS_${mod})
-lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD) \$(LIBS_${mod})
+lib${mod}_plugin_la_LIBADD = \$(LIBS_${mod})
lib${mod}_plugin_la_LDFLAGS = \$(AM_LDFLAGS) -rpath '\$(${basedir}dir)' \$(LDFLAGS_${mod})
EOF
case " ${plugins} " in
diff --git a/modules/gui/qt4/Makefile.am b/modules/gui/qt4/Makefile.am
index 4141230e6a00..1e3a725c9c68 100644
--- a/modules/gui/qt4/Makefile.am
+++ b/modules/gui/qt4/Makefile.am
@@ -15,7 +15,7 @@ guidir = $(pluginsdir)/gui
SUFFIXES = .ui .h .hpp .moc.cpp
libqt4_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS)
-libqt4_plugin_la_LIBADD = $(AM_LIBADD) $(QT_LIBS)
+libqt4_plugin_la_LIBADD = $(QT_LIBS)
libqt4_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)'
if HAVE_OS2
else
diff --git a/modules/hw/vdpau/Makefile.am b/modules/hw/vdpau/Makefile.am
index ef4ef1f4f41c..731eb3df4b01 100644
--- a/modules/hw/vdpau/Makefile.am
+++ b/modules/hw/vdpau/Makefile.am
@@ -2,7 +2,6 @@ include $(top_srcdir)/modules/common.am
vdpaudir = $(pluginsdir)/vdpau
AM_CFLAGS += $(VDPAU_CFLAGS)
-AM_LIBADD += libvlc_vdpau.la
libvlc_vdpau_la_SOURCES = vlc_vdpau.c vlc_vdpau.h instance.c
libvlc_vdpau_la_CPPFLAGS =
@@ -19,7 +18,7 @@ vdpau_LTLIBRARIES =
libvdpau_avcodec_plugin_la_SOURCES = avcodec.c picture.c
libvdpau_avcodec_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(X_CFLAGS) $(AVCODEC_CFLAGS)
-libvdpau_avcodec_plugin_la_LIBADD = $(AM_LIBADD) \
+libvdpau_avcodec_plugin_la_LIBADD = libvlc_vdpau.la \
$(X_LIBS) $(X_PRE_LIBS) -lX11 $(AVCODEC_LIBS)
# FIXME: hwdummy only needs libavutil, and only if avcodec < 55.13.0
if HAVE_AVCODEC_VDPAU
@@ -28,30 +27,28 @@ endif
libvdpau_deinterlace_plugin_la_SOURCES = deinterlace.c picture.c
libvdpau_deinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) # dummy
-libvdpau_deinterlace_plugin_la_LIBADD = $(AM_LIBADD)
+libvdpau_deinterlace_plugin_la_LIBADD = libvlc_vdpau.la
vdpau_LTLIBRARIES += libvdpau_deinterlace_plugin.la
libvdpau_adjust_plugin_la_SOURCES = adjust.c picture.c
libvdpau_adjust_plugin_la_CFLAGS = $(AM_CFLAGS) # dummy
-libvdpau_adjust_plugin_la_LIBADD = $(AM_LIBADD)
+libvdpau_adjust_plugin_la_LIBADD = libvlc_vdpau.la
vdpau_LTLIBRARIES += libvdpau_adjust_plugin.la
libvdpau_sharpen_plugin_la_SOURCES = sharpen.c picture.c
libvdpau_sharpen_plugin_la_CFLAGS = $(AM_CFLAGS) # dummy
-libvdpau_sharpen_plugin_la_LIBADD = $(AM_LIBADD)
+libvdpau_sharpen_plugin_la_LIBADD = libvlc_vdpau.la
vdpau_LTLIBRARIES += libvdpau_sharpen_plugin.la
libvdpau_chroma_plugin_la_SOURCES = chroma.c picture.c
libvdpau_chroma_plugin_la_CFLAGS = $(AM_CFLAGS) # dummy
-libvdpau_chroma_plugin_la_LIBADD = $(AM_LIBADD)
+libvdpau_chroma_plugin_la_LIBADD = libvlc_vdpau.la
vdpau_LTLIBRARIES += libvdpau_chroma_plugin.la
libvdpau_display_plugin_la_SOURCES = display.c
-libvdpau_display_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
- -I$(srcdir)/../../video_output/xcb
-libvdpau_display_plugin_la_CFLAGS = $(AM_CFLAGS) \
- $(XCB_CFLAGS)
-libvdpau_display_plugin_la_LIBADD = \
+libvdpau_display_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../video_output/xcb
+libvdpau_display_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
+libvdpau_display_plugin_la_LIBADD = libvlc_vdpau.la \
../../video_output/libvlc_xcb_events.la \
$(AM_LIBADD) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XCB_LIBS)
vdpau_LTLIBRARIES += libvdpau_display_plugin.la
diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index cf1aadfaf0b7..8a0a3c5953e7 100644
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -13,15 +13,11 @@ libexport_plugin_la_SOURCES = \
playlist/m3u.c \
playlist/xspf.c \
playlist/export.c
-libexport_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libexport_plugin_la_DEPENDENCIES = libexport_plugin.rc.o
-endif
misc_LTLIBRARIES += libexport_plugin.la
libgnutls_plugin_la_SOURCES = gnutls.c dhparams.h
libgnutls_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNUTLS_CFLAGS)
-libgnutls_plugin_la_LIBADD = $(AM_LIBADD) $(GNUTLS_LIBS)
+libgnutls_plugin_la_LIBADD = $(GNUTLS_LIBS)
if HAVE_WIN32
libgnutls_plugin_la_LIBADD += $(SOCKET_LIBS)
endif
@@ -30,33 +26,26 @@ EXTRA_LTLIBRARIES += libgnutls_plugin.la
misc_LTLIBRARIES += $(LTLIBgnutls)
libxdg_screensaver_plugin_la_SOURCES = inhibit/xdg.c
-libxdg_screensaver_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_XCB
-misc_LTLIBRARIES += \
- libxdg_screensaver_plugin.la
+misc_LTLIBRARIES += libxdg_screensaver_plugin.la
endif
libdbus_screensaver_plugin_la_SOURCES = inhibit/dbus.c
libdbus_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS) $(DBUS_CFLAGS)
-libdbus_screensaver_plugin_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS)
+libdbus_screensaver_plugin_la_LIBADD = $(DBUS_LIBS)
if HAVE_DBUS
misc_LTLIBRARIES += libdbus_screensaver_plugin.la
endif
liblogger_plugin_la_SOURCES = logger.c
-liblogger_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_ANDROID
-liblogger_plugin_la_LIBADD += -llog
+liblogger_plugin_la_LIBADD = -llog
endif
if HAVE_WIN32
liblogger_plugin_la_DEPENDENCIES = liblogger_plugin.rc.o
endif
libstats_plugin_la_SOURCES = stats.c
-libstats_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libstats_plugin_la_DEPENDENCIES = libstats_plugin.rc.o
-endif
misc_LTLIBRARIES += \
libaudioscrobbler_plugin.la \
diff --git a/modules/mux/Modules.am b/modules/mux/Modules.am
index 3daf605fa2a0..b9c43bb3a9f3 100644
--- a/modules/mux/Modules.am
+++ b/modules/mux/Modules.am
@@ -19,10 +19,6 @@ libmux_ps_plugin_la_SOURCES = \
mpeg/pes.c mpeg/pes.h \
mpeg/ps.c mpeg/bits.h
libmux_ps_plugin_la_CFLAGS = $(AM_CLFAGS)
-libmux_ps_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libmux_ps_plugin_la_DEPENDENCIES = libmux_ps_plugin.rc.o
-endif
mux_LTLIBRARIES += libmux_ps_plugin.la
libmux_ts_plugin_la_SOURCES = \
@@ -30,7 +26,7 @@ libmux_ts_plugin_la_SOURCES = \
mpeg/csa.c mpeg/csa.h \
mpeg/ts.c mpeg/bits.h mpeg/dvbpsi_compat.h
libmux_ts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS)
-libmux_ts_plugin_la_LIBADD = $(AM_LIBADD) $(DVBPSI_LIBS)
+libmux_ts_plugin_la_LIBADD = $(DVBPSI_LIBS)
if HAVE_WIN32
libmux_ts_plugin_la_DEPENDENCIES = libmux_ts_plugin.rc.o
endif
diff --git a/modules/notify/Makefile.am b/modules/notify/Makefile.am
index bcee528a3a0b..84153c4e5cf9 100644
--- a/modules/notify/Makefile.am
+++ b/modules/notify/Makefile.am
@@ -5,12 +5,12 @@ AM_LDFLAGS += -rpath '$(notifydir)'
libgrowl_plugin_la_SOURCES = growl.m
libgrowl_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) $(OBJCFLAGS_growl)
-libgrowl_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_growl)
+libgrowl_plugin_la_LIBADD = $(LIBS_growl)
libgrowl_plugin_la_LIBTOOLFLAGS=--tag=CC
libnotify_plugin_la_SOURCES = notify.c
libnotify_plugin_la_CFLAGS = $(AM_CFLAGS) $(NOTIFY_CFLAGS)
-libnotify_plugin_la_LIBADD = $(AM_LIBADD) $(NOTIFY_LIBS)
+libnotify_plugin_la_LIBADD = $(NOTIFY_LIBS)
notify_LTLIBRARIES = $(LTLIBgrowl) $(LTLIBnotify)
EXTRA_LTLIBRARIES = libgrowl_plugin.la libnotify_plugin.la
diff --git a/modules/services_discovery/Modules.am b/modules/services_discovery/Modules.am
index 0a4f0ba863b3..bf5a5f2c8aa8 100644
--- a/modules/services_discovery/Modules.am
+++ b/modules/services_discovery/Modules.am
@@ -9,7 +9,7 @@ SOURCES_mediadirs = mediadirs.c
libsap_plugin_la_SOURCES = sap.c
libsap_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_sap)
-libsap_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_sap) $(SOCKET_LIBS)
+libsap_plugin_la_LIBADD = $(LIBS_sap) $(SOCKET_LIBS)
if HAVE_WIN32
libsap_plugin_la_DEPENDENCIES = libsap_plugin.rc.o
endif
@@ -17,15 +17,14 @@ sd_LTLIBRARIES += libsap_plugin.la
libpulselist_plugin_la_SOURCES = pulse.c
libpulselist_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
-libpulselist_plugin_la_LIBADD = ../libvlc_pulse.la \
- $(AM_LIBADD) $(PULSE_LIBS)
+libpulselist_plugin_la_LIBADD = ../libvlc_pulse.la $(PULSE_LIBS)
if HAVE_PULSE
sd_LTLIBRARIES += libpulselist_plugin.la
endif
libudev_plugin_la_SOURCES = udev.c
libudev_plugin_la_CFLAGS = $(AM_CFLAGS) $(UDEV_CFLAGS)
-libudev_plugin_la_LIBADD = $(AM_LIBADD) $(UDEV_LIBS)
+libudev_plugin_la_LIBADD = $(UDEV_LIBS)
if HAVE_ALSA
libudev_plugin_la_CFLAGS += $(ALSA_CFLAGS) -DHAVE_ALSA
libudev_plugin_la_LIBADD += $(ALSA_LIBS)
@@ -36,20 +35,18 @@ sd_LTLIBRARIES += $(LTLIBudev)
libxcb_apps_plugin_la_SOURCES = xcb_apps.c
libxcb_apps_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
-libxcb_apps_plugin_la_LIBADD = $(AM_LIBADD) $(XCB_LIBS)
+libxcb_apps_plugin_la_LIBADD = $(XCB_LIBS)
if HAVE_XCB
sd_LTLIBRARIES += libxcb_apps_plugin.la
endif
libwindrive_plugin_la_SOURCES = windrive.c
-libwindrive_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_WIN32
sd_LTLIBRARIES += libwindrive_plugin.la
libwindrive_plugin_la_DEPENDENCIES = libwindrive_plugin.rc.o
endif
libos2drive_plugin_la_SOURCES = os2drive.c
-libos2drive_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_OS2
sd_LTLIBRARIES += libos2drive_plugin.la
endif
diff --git a/modules/stream_filter/Makefile.am b/modules/stream_filter/Makefile.am
index 7106918086d8..59e471fd7e40 100644
--- a/modules/stream_filter/Makefile.am
+++ b/modules/stream_filter/Makefile.am
@@ -4,7 +4,6 @@ stream_filterdir = $(pluginsdir)/stream_filter
stream_filter_LTLIBRARIES =
libdecomp_plugin_la_SOURCES = decomp.c
-libdecomp_plugin_la_LIBADD = $(AM_LIBADD)
if !HAVE_WIN32
stream_filter_LTLIBRARIES += libdecomp_plugin.la
endif
@@ -93,7 +92,7 @@ libdash_plugin_la_SOURCES = \
dash/Helper.cpp \
dash/Helper.h
libdash_plugin_la_CXXFLAGS = $(AM_CFLAGS) -I$(srcdir)/dash
-libdash_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libdash_plugin_la_LIBADD = $(SOCKET_LIBS)
stream_filter_LTLIBRARIES += libdash_plugin.la
if HAVE_WIN32
libdash_plugin_la_DEPENDENCIES = libdash_plugin.rc.o
@@ -113,7 +112,7 @@ stream_filter_LTLIBRARIES += libsmooth_plugin.la
libhttplive_plugin_la_SOURCES = httplive.c
libhttplive_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
-libhttplive_plugin_la_LIBADD = $(AM_LIBADD) $(GCRYPT_LIBS) -lgpg-error
+libhttplive_plugin_la_LIBADD = $(GCRYPT_LIBS) -lgpg-error
if HAVE_WIN32
libhttplive_plugin_la_DEPENDENCIES = libhttplive_plugin.rc.o
endif
@@ -122,5 +121,4 @@ stream_filter_LTLIBRARIES += libhttplive_plugin.la
endif
librecord_plugin_la_SOURCES = record.c
-librecord_plugin_la_LIBADD = $(AM_LIBADD)
stream_filter_LTLIBRARIES += librecord_plugin.la
diff --git a/modules/stream_out/Modules.am b/modules/stream_out/Modules.am
index d9f959d939f2..2b046926a538 100644
--- a/modules/stream_out/Modules.am
+++ b/modules/stream_out/Modules.am
@@ -19,10 +19,6 @@ libstream_out_transcode_plugin_la_SOURCES = \
transcode/transcode.c transcode/transcode.h \
transcode/osd.c transcode/spu.c transcode/audio.c transcode/video.c
libstream_out_transcode_plugin_la_CFLAGS = $(AM_CFLAGS)
-libstream_out_transcode_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libstream_out_transcode_plugin_la_DEPENDENCIES = libstream_out_transcode_plugin.rc.o
-endif
stream_out_LTLIBRARIES += \
@@ -49,7 +45,7 @@ stream_out_LTLIBRARIES += \
libstream_out_rtp_plugin_la_SOURCES = \
rtp.c rtp.h rtpfmt.c rtcp.c rtsp.c vod.c
libstream_out_rtp_plugin_la_CFLAGS = $(AM_CFLAGS)
-libstream_out_rtp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libstream_out_rtp_plugin_la_LIBADD = $(SOCKET_LIBS)
if HAVE_WIN32
libstream_out_rtp_plugin_la_DEPENDENCIES = libstream_out_rtp_plugin.rc.o
endif
@@ -64,7 +60,7 @@ endif
# RAOP plugin
libstream_out_raop_plugin_la_SOURCES = raop.c
libstream_out_raop_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
-libstream_out_raop_plugin_la_LIBADD = $(AM_LIBADD) $(GCRYPT_LIBS) -lgpg-error $(LIBS_stream_out_raop)
+libstream_out_raop_plugin_la_LIBADD = $(GCRYPT_LIBS) -lgpg-error $(LIBS_stream_out_raop)
if HAVE_WIN32
libstream_out_raop_plugin_la_DEPENDENCIES = libstream_out_raop_plugin.rc.o
endif
diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am
index 19c0f8926f3c..f3fd61d83cf6 100644
--- a/modules/video_chroma/Makefile.am
+++ b/modules/video_chroma/Makefile.am
@@ -5,18 +5,18 @@ libchain_plugin_la_SOURCES = chain.c
libchroma_omx_plugin_la_SOURCES = omxdl.c
libchroma_omx_plugin_la_CFLAGS = $(AM_CFLAGS) $(OMXIP_CFLAGS)
-libchroma_omx_plugin_la_LIBADD = $(AM_LIBADD) $(OMXIP_LIBS)
+libchroma_omx_plugin_la_LIBADD = $(OMXIP_LIBS)
libswscale_plugin_la_SOURCES = swscale.c ../codec/avcodec/chroma.c
libswscale_plugin_la_CFLAGS = $(AM_CFLAGS) $(SWSCALE_CFLAGS)
-libswscale_plugin_la_LIBADD = $(AM_LIBADD) $(SWSCALE_LIBS)
+libswscale_plugin_la_LIBADD = $(SWSCALE_LIBS)
libswscale_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(chromadir)'
libgrey_yuv_plugin_la_SOURCES = grey_yuv.c
libi420_rgb_plugin_la_SOURCES = i420_rgb.c i420_rgb.h \
i420_rgb8.c i420_rgb16.c i420_rgb_c.h
-libi420_rgb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
+libi420_rgb_plugin_la_LIBADD = $(LIBM)
libi420_yuy2_plugin_la_SOURCES = i420_yuy2.c i420_yuy2.h
libi420_yuy2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am
index b48a0122026c..d7746d52a34c 100644
--- a/modules/video_filter/Modules.am
+++ b/modules/video_filter/Modules.am
@@ -25,7 +25,6 @@ libdeinterlace_plugin_la_SOURCES = \
deinterlace/algo_ivtc.c deinterlace/algo_ivtc.h
# inline ASM doesn't build with -O0
libdeinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) -O2
-libdeinterlace_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_NEON
libdeinterlace_plugin_la_SOURCES += deinterlace/merge_arm.S
libdeinterlace_plugin_la_CFLAGS += -DCAN_COMPILE_ARM
@@ -41,14 +40,13 @@ libdynamicoverlay_plugin_la_SOURCES = \
dynamicoverlay/dynamicoverlay_list.c \
dynamicoverlay/dynamicoverlay_commands.c \
dynamicoverlay/dynamicoverlay.c dynamicoverlay/dynamicoverlay.h
-libdynamicoverlay_plugin_la_LIBADD = $(AM_LIBADD)
if !HAVE_WIN32
video_filter_LTLIBRARIES += libdynamicoverlay_plugin.la
endif
libremoteosd_plugin_la_SOURCES = remoteosd.c remoteosd_rfbproto.h
libremoteosd_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS)
-libremoteosd_plugin_la_LIBADD = $(AM_LIBADD) $(GCRYPT_LIBS) $(LIBS_remoteosd)
+libremoteosd_plugin_la_LIBADD = $(GCRYPT_LIBS) $(LIBS_remoteosd)
if HAVE_WIN32
libremoteosd_plugin_la_DEPENDENCIES = libremoteosd_plugin.rc.o
endif
@@ -62,10 +60,6 @@ libpuzzle_plugin_la_SOURCES = \
puzzle_lib.c puzzle_lib.h \
puzzle_mgt.c puzzle_mgt.h \
puzzle_pce.c puzzle_pce.h
-libpuzzle_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libpuzzle_plugin_la_DEPENDENCIES = libpuzzle_plugin.rc.o
-endif
video_filter_LTLIBRARIES += libpuzzle_plugin.la
SOURCES_magnify = magnify.c
diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 6ad081d230eb..056ba85c77c8 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -17,7 +17,7 @@ SOURCES_android_surface = androidsurface.c
if HAVE_DECKLINK
libdecklinkoutput_plugin_la_SOURCES = decklink.cpp
libdecklinkoutput_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklinkoutput)
-libdecklinkoutput_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_decklink) $(LIBDL)
+libdecklinkoutput_plugin_la_LIBADD = $(LIBS_decklink) $(LIBDL)
vout_LTLIBRARIES += libdecklinkoutput_plugin.la
endif
@@ -25,17 +25,17 @@ endif
# TODO: merge all three source files (?)
libgles2_plugin_la_SOURCES = opengl.c opengl.h gl.c
libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES=2
-libgles2_plugin_la_LIBADD = $(AM_LIBADD) $(GLES2_LIBS)
+libgles2_plugin_la_LIBADD = $(GLES2_LIBS)
libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libgles1_plugin_la_SOURCES = opengl.c opengl.h gl.c
libgles1_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES1_CFLAGS) -DUSE_OPENGL_ES=1
-libgles1_plugin_la_LIBADD = $(AM_LIBADD) $(GLES1_LIBS)
+libgles1_plugin_la_LIBADD = $(GLES1_LIBS)
libgles1_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libgl_plugin_la_SOURCES = opengl.c opengl.h gl.c
libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
-libgl_plugin_la_LIBADD = $(AM_LIBADD) $(GL_LIBS)
+libgl_plugin_la_LIBADD = $(GL_LIBS)
libgl_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += libgles2_plugin.la libgles1_plugin.la libgl_plugin.la
@@ -47,14 +47,14 @@ libvlc_xcb_events_la_SOURCES = xcb/events.c xcb/events.h
libvlc_xcb_events_la_CPPFLAGS = -DMODULE_STRING=\"xcb\"
libvlc_xcb_events_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS)
libvlc_xcb_events_la_LDFLAGS = -static
-libvlc_xcb_events_la_LIBADD = $(AM_LIBADD) $(XCB_LIBS)
+libvlc_xcb_events_la_LIBADD = $(XCB_LIBS)
libxcb_x11_plugin_la_SOURCES = \
xcb/pictures.c xcb/pictures.h \
xcb/x11.c
libxcb_x11_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(XCB_SHM_CFLAGS)
-libxcb_x11_plugin_la_LIBADD = libvlc_xcb_events.la $(AM_LIBADD) \
+libxcb_x11_plugin_la_LIBADD = libvlc_xcb_events.la \
$(XCB_LIBS) $(XCB_SHM_LIBS)
libxcb_xv_plugin_la_SOURCES = \
@@ -62,7 +62,7 @@ libxcb_xv_plugin_la_SOURCES = \
xcb/xvideo.c
libxcb_xv_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_XV_CFLAGS)
-libxcb_xv_plugin_la_LIBADD = libvlc_xcb_events.la $(AM_LIBADD) \
+libxcb_xv_plugin_la_LIBADD = libvlc_xcb_events.la \
$(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_XV_LIBS)
libxcb_xv_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
@@ -71,20 +71,15 @@ libxcb_glx_plugin_la_SOURCES = \
xcb/glx.c
libxcb_glx_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(GL_CFLAGS)
-libxcb_glx_plugin_la_LIBADD = libvlc_xcb_events.la $(AM_LIBADD) \
+libxcb_glx_plugin_la_LIBADD = libvlc_xcb_events.la \
$(XCB_LIBS) $(GL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
libxcb_glx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c xcb/keysym.h xcb/xcb_keysym.h
libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(CFLAGS_xcb_window) \
- $(XPROTO_CFLAGS) \
- $(XCB_CFLAGS) \
- $(XCB_KEYSYMS_CFLAGS)
-libxcb_window_plugin_la_LIBADD = $(AM_LIBADD) \
- $(XPROTO_LIBS) \
- $(XCB_LIBS) \
- $(XCB_KEYSYMS_LIBS)
+ $(XPROTO_CFLAGS) $(XCB_CFLAGS) $(XCB_KEYSYMS_CFLAGS)
+libxcb_window_plugin_la_LIBADD = $(XPROTO_LIBS) $(XCB_LIBS) $(XCB_KEYSYMS_LIBS)
if HAVE_XCB
noinst_LTLIBRARIES += libvlc_xcb_events.la
@@ -100,7 +95,7 @@ libdirect2d_plugin_la_SOURCES = msw/direct2d.c \
msw/common.c msw/common.h msw/events.c msw/events.h
libdirect2d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_direct2d
-libdirect2d_plugin_la_LIBADD = $(AM_LIBADD) -lgdi32 -lole32 -luuid
+libdirect2d_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
libdirect2d_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
vout_LTLIBRARIES += $(LTLIBdirect2d)
EXTRA_LTLIBRARIES += libdirect2d_plugin.la
@@ -109,7 +104,7 @@ libdirect3d_plugin_la_SOURCES = msw/direct3d.c \
msw/common.c msw/common.h msw/events.c msw/events.h
libdirect3d_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_direct3d
-libdirect3d_plugin_la_LIBADD = $(AM_LIBADD) -lgdi32 -lole32 -luuid
+libdirect3d_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
libdirect3d_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
vout_LTLIBRARIES += $(LTLIBdirect3d)
EXTRA_LTLIBRARIES += libdirect3d_plugin.la
@@ -118,7 +113,7 @@ libdirectdraw_plugin_la_SOURCES = msw/directx.c \
msw/common.c msw/common.h msw/events.c msw/events.h
libdirectdraw_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_directdraw
-libdirectdraw_plugin_la_LIBADD = $(AM_LIBADD) -luser32 -lgdi32 -lole32 -luuid
+libdirectdraw_plugin_la_LIBADD = -luser32 -lgdi32 -lole32 -luuid
if HAVE_DIRECTX
vout_LTLIBRARIES += libdirectdraw_plugin.la
endif
@@ -127,7 +122,7 @@ libglwin32_plugin_la_SOURCES = msw/glwin32.c opengl.c opengl.h \
msw/common.c msw/common.h msw/events.c msw/events.h
libglwin32_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_glwin32
-libglwin32_plugin_la_LIBADD = $(AM_LIBADD) -lopengl32 -lgdi32 -lole32 -luuid
+libglwin32_plugin_la_LIBADD = -lopengl32 -lgdi32 -lole32 -luuid
libglwin32_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
vout_LTLIBRARIES += $(LTLIBglwin32)
EXTRA_LTLIBRARIES += libglwin32_plugin.la
@@ -136,14 +131,13 @@ libwingdi_plugin_la_SOURCES = msw/wingdi.c \
msw/common.c msw/common.h msw/events.c msw/events.h
libwingdi_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) \
-DMODULE_NAME_IS_wingdi
-libwingdi_plugin_la_LIBADD = $(AM_LIBADD) -lgdi32 -lole32 -luuid
+libwingdi_plugin_la_LIBADD = -lgdi32 -lole32 -luuid
if HAVE_WIN32
vout_LTLIBRARIES += libwingdi_plugin.la
libwingdi_plugin_la_DEPENDENCIES = libwingdi_plugin.rc.o
endif
libdrawable_plugin_la_SOURCES = drawable.c
-libdrawable_plugin_la_LIBADD = $(AM_LIBADD)
if HAVE_WIN32
vout_LTLIBRARIES += libdrawable_plugin.la
libdrawable_plugin_la_DEPENDENCIES = libdrawable_plugin.rc.o
@@ -155,7 +149,7 @@ vout_LTLIBRARIES += libdrawable_plugin.la
endif
libkva_plugin_la_SOURCES = kva.c
-libkva_plugin_la_LIBADD = $(AM_LIBADD) $(KVA_LIBS)
+libkva_plugin_la_LIBADD = $(KVA_LIBS)
if HAVE_KVA
vout_LTLIBRARIES += libkva_plugin.la
endif
@@ -163,7 +157,7 @@ endif
### EGL ###
libegl_plugin_la_SOURCES = egl.c
libegl_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS)
-libegl_plugin_la_LIBADD = $(AM_LIBADD) $(EGL_LIBS)
+libegl_plugin_la_LIBADD = $(EGL_LIBS)
if !HAVE_WIN32
if !HAVE_DARWIN
libegl_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
@@ -176,7 +170,7 @@ vout_LTLIBRARIES += $(LTLIBegl)
### GLX ###
libglx_plugin_la_SOURCES = glx.c
libglx_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
-libglx_plugin_la_LIBADD = $(AM_LIBADD) $(GL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
+libglx_plugin_la_LIBADD = $(GL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11
if HAVE_WIN32
libglx_plugin_la_DEPENDENCIES = libglx_plugin.rc.o
endif
@@ -187,7 +181,7 @@ vout_LTLIBRARIES += $(LTLIBglx)
### Coloured ASCII art ###
libcaca_plugin_la_SOURCES = caca.c
libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
-libcaca_plugin_la_LIBADD = $(AM_LIBADD) $(CACA_LIBS)
+libcaca_plugin_la_LIBADD = $(CACA_LIBS)
if !HAVE_WIN32
if !HAVE_DARWIN
libcaca_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11
@@ -199,10 +193,6 @@ vout_LTLIBRARIES += $(LTLIBcaca)
### Common ###
libvdummy_plugin_la_SOURCES = vdummy.c
-libvdummy_plugin_la_LIBADD = $(AM_LIBADD)
-if HAVE_WIN32
-libvdummy_plugin_la_DEPENDENCIES = libvdummy_plugin.rc.o
-endif
vout_LTLIBRARIES += \
libvdummy_plugin.la \
diff --git a/modules/video_splitter/Makefile.am b/modules/video_splitter/Makefile.am
index 649aa1e52777..451c3c58b30e 100644
--- a/modules/video_splitter/Makefile.am
+++ b/modules/video_splitter/Makefile.am
@@ -11,7 +11,7 @@ libwall_plugin_la_SOURCES = wall.c
libpanoramix_plugin_la_SOURCES = panoramix.c
libpanoramix_plugin_la_CFLAGS = $(AM_CFLAGS)
-libpanoramix_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
+libpanoramix_plugin_la_LIBADD = $(LIBM)
if HAVE_WIN32
splitter_LTLIBRARIES += libpanoramix_plugin.la
else
diff --git a/modules/visualization/Modules.am b/modules/visualization/Modules.am
index d3fc6eb0276b..27ac3233a943 100644
--- a/modules/visualization/Modules.am
+++ b/modules/visualization/Modules.am
@@ -5,7 +5,7 @@ libvisual_plugin_la_SOURCES = \
visual/visual.c visual/visual.h \
visual/effects.c \
visual/fft.c visual/fft.h
-libvisual_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
+libvisual_plugin_la_LIBADD = $(LIBM)
visualization_LTLIBRARIES += libvisual_plugin.la
SOURCES_vsxu = vsxu.cpp cyclic_buffer.h
--
GitLab