Commit 98cea7a2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

modules: remove VLC-specific AM_LIBADD, simplify

parent 20cdb051
......@@ -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
......
......@@ -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
......@@ -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
......
......@@ -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
......@@ -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 \
......
......@@ -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
......
......@@ -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 \
......
......@@ -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
......@@ -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)
......
......@@ -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)
......
......@@ -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
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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 =