From 0bafe94c50caf457afc5d0a244695db4f6122a09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> Date: Thu, 6 Sep 2012 16:55:07 +0300 Subject: [PATCH] Remove empty *_DEPENDENCIES in makefiles --- modules/access/Modules.am | 15 +-------------- modules/access/rtp/Modules.am | 3 +-- modules/altivec/Modules.am | 1 - modules/arm_neon/Modules.am | 4 ---- modules/audio_filter/Modules.am | 1 - modules/audio_output/Modules.am | 10 ---------- modules/codec/avcodec/Modules.am | 1 - modules/common.am | 2 +- modules/demux/Modules.am | 1 - modules/genmf | 3 +-- modules/misc/Modules.am | 4 ---- modules/mmx/Modules.am | 3 --- modules/mux/Modules.am | 1 - modules/services_discovery/Modules.am | 5 ----- modules/sse2/Modules.am | 3 --- modules/stream_filter/Modules.am | 1 - modules/stream_out/Modules.am | 3 --- modules/video_chroma/Modules.am | 1 - modules/video_filter/Modules.am | 3 --- modules/video_output/Modules.am | 12 ------------ modules/video_output/msw/Modules.am | 1 - 21 files changed, 4 insertions(+), 74 deletions(-) diff --git a/modules/access/Modules.am b/modules/access/Modules.am index b04467c99417..80ff0735bfc0 100644 --- a/modules/access/Modules.am +++ b/modules/access/Modules.am @@ -17,17 +17,14 @@ libfilesystem_plugin_la_LIBADD = $(AM_LIBADD) if HAVE_WIN32 libfilesystem_plugin_la_LIBADD += -lshlwapi endif -libfilesystem_plugin_la_DEPENDENCIES = libidummy_plugin_la_SOURCES = idummy.c libidummy_plugin_la_CFLAGS = $(AM_CFLAGS) libidummy_plugin_la_LIBADD = $(AM_LIBADD) -libidummy_plugin_la_DEPENDENCIES = libsdp_plugin_la_SOURCES = sdp.c libsdp_plugin_la_CFLAGS = $(AM_CFLAGS) libsdp_plugin_la_LIBADD = $(AM_LIBADD) -libsdp_plugin_la_DEPENDENCIES = libaccess_smb_plugin_la_SOURCES = smb.c libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS) @@ -35,7 +32,6 @@ libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb) if HAVE_WIN32 libaccess_smb_plugin_la_LIBADD += -lmpr endif -libaccess_smb_plugin_la_DEPENDENCIES = libvlc_LTLIBRARIES += $(LTLIBaccess_smb) SOURCES_access_directory = directory.c @@ -81,12 +77,10 @@ if HAVE_QTKIT libqtcapture_plugin_la_SOURCES = qtcapture.m libqtcapture_plugin_la_LIBADDD = $(AM_LIBADD) libqtcapture_plugin_la_LDFLAGS = -Wl,-framework,Cocoa -Wl,-framework,QTKit -Wl,-framework,CoreVideo -Wl,-framework,QuartzCore -libqtcapture_plugin_la_DEPENDENCIES = libqtsound_plugin_la_SOURCES = qtsound.m libqtsound_plugin_la_LIBADD = $(AM_LIBADD) libqtsound_plugin_la_LDFLAGS = -Wl,-framework,Cocoa -Wl,-framework,QTKit -Wl,-framework,CoreAudio -libqtsound_plugin_la_DEPENDENCIES = libvlc_LTLIBRARIES += \ libqtcapture_plugin.la \ @@ -112,7 +106,6 @@ libvlc_LTLIBRARIES += \ libaccess_oss_plugin_la_SOURCES = oss.c libaccess_oss_plugin_la_CFLAGS = $(AM_CFLAGS) libaccess_oss_plugin_la_LIBADD = $(AM_LIBADD) $(OSS_LIBS) -libaccess_oss_plugin_la_DEPENDENCIES = if HAVE_OSS libvlc_LTLIBRARIES += libaccess_oss_plugin.la endif @@ -120,7 +113,6 @@ 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_DEPENDENCIES = if HAVE_ALSA libvlc_LTLIBRARIES += libaccess_alsa_plugin.la endif @@ -131,7 +123,6 @@ libpulsesrc_plugin_la_SOURCES = \ pulse.c libpulsesrc_plugin_la_CFLAGS= $(AM_CFLAGS) $(PULSE_CFLAGS) libpulsesrc_plugin_la_LIBADD = $(AM_LIBADD) $(PULSE_LIBS) -libpulsesrc_plugin_la_DEPENDENCIES = if HAVE_PULSE libvlc_LTLIBRARIES += libpulsesrc_plugin.la endif @@ -139,7 +130,6 @@ endif libaccess_shm_plugin_la_SOURCES = shm.c libaccess_shm_plugin_la_CFLAGS = $(AM_CFLAGS) libaccess_shm_plugin_la_LIBADD = $(AM_LIBADD) -libaccess_shm_plugin_la_DEPENDENCIES = libvlc_LTLIBRARIES += $(LTLIBaccess_shm) libv4l2_plugin_la_SOURCES = \ @@ -154,7 +144,6 @@ libv4l2_plugin_la_SOURCES = \ v4l2/v4l2.h libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS) libv4l2_plugin_la_LIBADD = $(AM_LIBADD) $(LIBDL) $(LIBM) -libv4l2_plugin_la_DEPENDENCIES = if HAVE_V4L2 libvlc_LTLIBRARIES += libv4l2_plugin.la endif @@ -164,7 +153,6 @@ libxcb_screen_plugin_la_CFLAGS = $(AM_CFLAGS) \ $(XCB_CFLAGS) $(XCB_COMPOSITE_CFLAGS) libxcb_screen_plugin_la_LIBADD = $(AM_LIBADD) \ $(XCB_LIBS) $(XCB_COMPOSITE_LIBS) -libxcb_screen_plugin_la_DEPENDENCIES = if HAVE_XCB libvlc_LTLIBRARIES += libxcb_screen_plugin.la endif @@ -177,7 +165,6 @@ libdtv_plugin_la_SOURCES = \ dtv/access.c libdtv_plugin_la_CFLAGS = $(AM_CFLAGS) libdtv_plugin_la_LIBADD = $(AM_LIBADD) -libdtv_plugin_la_DEPENDENCIES = if HAVE_LINUX_DVB libdtv_plugin_la_SOURCES += dtv/linux.c @@ -199,7 +186,7 @@ libbda_la_LDFLAGS = -static libbda_la_LIBADD = -lstrmiids -lole32 -loleaut32 -luuid noinst_LTLIBRARIES = libbda.la -libdtv_plugin_la_DEPENDENCIES += libbda.la +libdtv_plugin_la_DEPENDENCIES = libbda.la libdtv_plugin_la_LIBADD += libbda.la -lstdc++ libvlc_LTLIBRARIES += libdtv_plugin.la endif diff --git a/modules/access/rtp/Modules.am b/modules/access/rtp/Modules.am index 7ffd6698cedc..4b8aa958502b 100644 --- a/modules/access/rtp/Modules.am +++ b/modules/access/rtp/Modules.am @@ -9,7 +9,6 @@ librtp_plugin_la_SOURCES = \ xiph.c librtp_plugin_la_CFLAGS = $(AM_CFLAGS) librtp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS) -librtp_plugin_la_DEPENDENCIES = # Secure RTP library libvlc_srtp_la_SOURCES = srtp.c @@ -31,7 +30,7 @@ TESTS = $(check_PROGRAMS) librtp_plugin_la_CFLAGS += -DHAVE_SRTP $(GCRYPT_CFLAGS) librtp_plugin_la_LIBADD += libvlc_srtp.la $(GCRYPT_LIBS) -librtp_plugin_la_DEPENDENCIES += libvlc_srtp.la +librtp_plugin_la_DEPENDENCIES = libvlc_srtp.la endif lcov-run: diff --git a/modules/altivec/Modules.am b/modules/altivec/Modules.am index 752dc8e3166f..5178b0163c15 100644 --- a/modules/altivec/Modules.am +++ b/modules/altivec/Modules.am @@ -3,7 +3,6 @@ libi420_yuy2_altivec_plugin_la_SOURCES = \ ../video_chroma/i420_yuy2.h libi420_yuy2_altivec_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_i420_yuy2_altivec) libi420_yuy2_altivec_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_i420_yuy2_altivec) -libi420_yuy2_altivec_plugin_la_DEPENDENCIES = libvlc_LTLIBRARIES += \ libi420_yuy2_altivec_plugin.la \ diff --git a/modules/arm_neon/Modules.am b/modules/arm_neon/Modules.am index b60011b63acb..498368a542e9 100644 --- a/modules/arm_neon/Modules.am +++ b/modules/arm_neon/Modules.am @@ -7,7 +7,6 @@ libaudio_format_neon_plugin_la_SOURCES = \ audio_format.c libaudio_format_neon_plugin_la_CFLAGS = $(AM_CFLAGS) libaudio_format_neon_plugin_la_LIBADD = $(AM_LIBADD) -libaudio_format_neon_plugin_la_DEPENDENCIES = libchroma_yuv_neon_plugin_la_SOURCES = \ i420_yuyv.S \ @@ -16,12 +15,10 @@ libchroma_yuv_neon_plugin_la_SOURCES = \ chroma_yuv.c chroma_neon.h libchroma_yuv_neon_plugin_la_CFLAGS = $(AM_CFLAGS) libchroma_yuv_neon_plugin_la_LIBADD = $(AM_LIBADD) -libchroma_yuv_neon_plugin_la_DEPENDENCIES = libvolume_neon_plugin_la_SOURCES = volume.c amplify.S libvolume_neon_plugin_la_CFLAGS = $(AM_CFLAGS) libvolume_neon_plugin_la_LIBADD = $(AM_LIBADD) -libvolume_neon_plugin_la_DEPENDENCIES = libyuv_rgb_neon_plugin_la_SOURCES = \ i420_rgb.S \ @@ -30,7 +27,6 @@ libyuv_rgb_neon_plugin_la_SOURCES = \ yuv_rgb.c libyuv_rgb_neon_plugin_la_CFLAGS = $(AM_CFLAGS) libyuv_rgb_neon_plugin_la_LIBADD = $(AM_LIBADD) -libyuv_rgb_neon_plugin_la_DEPENDENCIES = libvlc_LTLIBRARIES += \ libaudio_format_neon_plugin.la \ diff --git a/modules/audio_filter/Modules.am b/modules/audio_filter/Modules.am index 8c68116bbcd7..da4626c82e3a 100644 --- a/modules/audio_filter/Modules.am +++ b/modules/audio_filter/Modules.am @@ -72,7 +72,6 @@ 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_DEPENDENCIES = if HAVE_SPEEXDSP libvlc_LTLIBRARIES += libspeex_resampler_plugin.la endif diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am index 80516727487d..8f1032dac8de 100644 --- a/modules/audio_output/Modules.am +++ b/modules/audio_output/Modules.am @@ -7,12 +7,10 @@ SOURCES_opensles_android = opensles_android.c libadummy_plugin_la_SOURCES = adummy.c libadummy_plugin_la_CFLAGS = $(AM_CFLAGS) libadummy_plugin_la_LIBADD = $(AM_LIBADD) -libadummy_plugin_la_DEPENDENCIES = libamem_plugin_la_SOURCES = amem.c libamem_plugin_la_CFLAGS = $(AM_CFLAGS) libamem_plugin_la_LIBADD = $(AM_LIBADD) -libamem_plugin_la_DEPENDENCIES = libvlc_LTLIBRARIES += \ libadummy_plugin.la \ @@ -22,7 +20,6 @@ libvlc_LTLIBRARIES += \ liboss_plugin_la_SOURCES = oss.c packet.c volume.h liboss_plugin_la_CFLAGS = $(AM_CFLAGS) liboss_plugin_la_LIBADD = $(AM_LIBADD) $(OSS_LIBS) $(LIBM) -liboss_plugin_la_DEPENDENCIES = if HAVE_OSS libvlc_LTLIBRARIES += liboss_plugin.la endif @@ -30,7 +27,6 @@ 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_DEPENDENCIES = if HAVE_ALSA libvlc_LTLIBRARIES += libalsa_plugin.la endif @@ -38,7 +34,6 @@ endif libpulse_plugin_la_SOURCES = vlcpulse.c vlcpulse.h pulse.c libpulse_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS) libpulse_plugin_la_LIBADD = $(AM_LIBADD) $(PULSE_LIBS) $(LIBM) -libpulse_plugin_la_DEPENDENCIES = if HAVE_PULSE libvlc_LTLIBRARIES += libpulse_plugin.la endif @@ -46,14 +41,12 @@ endif libjack_plugin_la_SOURCES = jack.c packet.c volume.h libjack_plugin_la_CFLAGS = $(AM_CFLAGS) $(JACK_CFLAGS) libjack_plugin_la_LIBADD = $(AM_LIBADD) $(JACK_LIBS) $(LIBM) -libjack_plugin_la_DEPENDENCIES = EXTRA_LTLIBRARIES += libjack_plugin.la libvlc_LTLIBRARIES += $(LTLIBjack) libwasapi_plugin_la_SOURCES = wasapi.c libwasapi_plugin_la_CFLAGS = $(AM_CFLAGS) libwasapi_plugin_la_LIBADD = $(AM_LIBADD) -lole32 -lksuser -libwasapi_plugin_la_DEPENDENCIES = if HAVE_WASAPI libvlc_LTLIBRARIES += libwasapi_plugin.la endif @@ -61,7 +54,6 @@ endif libdirectsound_plugin_la_SOURCES = directx.c windows_audio_common.h packet.c libdirectsound_plugin_la_CFLAGS = $(AM_CFLAGS) libdirectsound_plugin_la_LIBADD = $(AM_LIBADD) -libdirectsound_plugin_la_DEPENDENCIES = if HAVE_DIRECTX libvlc_LTLIBRARIES += libdirectsound_plugin.la endif @@ -69,7 +61,6 @@ endif libkai_plugin_la_SOURCES = kai.c packet.c libkai_plugin_la_CFLAGS = $(AM_CFLAGS) libkai_plugin_la_LIBADD = $(AM_LIBADD) $(KAI_LIBS) -libkai_plugin_la_DEPENDENCIES = if HAVE_KAI libvlc_LTLIBRARIES += libkai_plugin.la endif @@ -77,7 +68,6 @@ endif libsndio_plugin_la_SOURCES = sndio.c libsndio_plugin_la_CFLAGS = $(AM_CFLAGS) libsndio_plugin_la_LIBADD = $(AM_LIBADD) -lsndio -libsndio_plugin_la_DEPENDENCIES = if HAVE_SNDIO libvlc_LTLIBRARIES += libsndio_plugin.la endif diff --git a/modules/codec/avcodec/Modules.am b/modules/codec/avcodec/Modules.am index 2e4884492467..a24659f9ecba 100644 --- a/modules/codec/avcodec/Modules.am +++ b/modules/codec/avcodec/Modules.am @@ -24,7 +24,6 @@ endif libavcodec_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_avcodec) libavcodec_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_avcodec) libavcodec_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(LDFLAGS_avcodec) -libavcodec_plugin_la_DEPENDENCIES = if MERGE_FFMPEG libavcodec_plugin_la_SOURCES += \ diff --git a/modules/common.am b/modules/common.am index 3dd8ad2e4ed5..a8f7d5de855f 100644 --- a/modules/common.am +++ b/modules/common.am @@ -14,7 +14,7 @@ CLEANFILES = $(BUILT_SOURCES) LTLIBVLCCORE = $(top_builddir)/src/libvlccore.la # Module name from object or executable file name. -MODULE_NAME = `p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; echo "$${p%_plugin*}"` +MODULE_NAME = $$(p="$@"; p="$${p\#\#*/}"; p="$${p\#lib}"; echo "$${p%_plugin*}") AM_CPPFLAGS = \ -DMODULE_NAME=$(MODULE_NAME) \ diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am index 45d2b4593109..3c0ec72d23a5 100644 --- a/modules/demux/Modules.am +++ b/modules/demux/Modules.am @@ -67,7 +67,6 @@ libvlc_LTLIBRARIES += \ libts_plugin_la_SOURCES = ts.c ../mux/mpeg/csa.c dvb-text.h libts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS) libts_plugin_la_LIBADD = $(AM_LIBADD) $(DVBPSI_LIBS) $(SOCKET_LIBS) -libts_plugin_la_DEPENDENCIES = if HAVE_DVBPSI libvlc_LTLIBRARIES += libts_plugin.la endif diff --git a/modules/genmf b/modules/genmf index 67fe47c5b5f7..0b9bdb59d00b 100755 --- a/modules/genmf +++ b/modules/genmf @@ -58,10 +58,9 @@ 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}) -# Set LIBADD and DEPENDENCIES manually: +# Set LIBADD manually: lib${mod}_plugin_la_LIBADD = \$(AM_LIBADD) \$(LIBS_${mod}) lib${mod}_plugin_la_LDFLAGS = \$(AM_LDFLAGS) \$(LDFLAGS_${mod}) -lib${mod}_plugin_la_DEPENDENCIES = EOF done diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am index 67feba69d1da..f74bb39efb8f 100644 --- a/modules/misc/Modules.am +++ b/modules/misc/Modules.am @@ -15,18 +15,15 @@ libgnutls_plugin_la_LIBADD = $(AM_LIBADD) $(GNUTLS_LIBS) $(GCRYPT_LIBS) if HAVE_WIN32 libgnutls_plugin_la_LIBADD += -lcrypt32 $(SOCKET_LIBS) endif -libgnutls_plugin_la_DEPENDENCIES = EXTRA_LTLIBRARIES += libgnutls_plugin.la libvlc_LTLIBRARIES += $(LTLIBgnutls) libxdg_screensaver_plugin_la_SOURCES = inhibit/xdg.c libxdg_screensaver_plugin_la_CFLAGS = $(AM_CFLAGS) libxdg_screensaver_plugin_la_LIBADD = $(AM_LIBADD) -libxdg_screensaver_plugin_la_DEPENDENCIES = libxscreensaver_plugin_la_SOURCES = inhibit/xscreensaver.c libxscreensaver_plugin_la_CFLAGS = $(AM_CFLAGS) libxscreensaver_plugin_la_LIBADD = $(AM_LIBADD) -libxscreensaver_plugin_la_DEPENDENCIES = if HAVE_XCB libvlc_LTLIBRARIES += \ libxdg_screensaver_plugin.la \ @@ -36,7 +33,6 @@ endif libmce_plugin_la_SOURCES = inhibit/mce.c libmce_plugin_la_CFLAGS = $(AM_CLFAGS) $(DBUS_CFLAGS) $(MCE_CFLAGS) libmce_plugin_la_LIBADD = $(AM_LIBADD) $(DBUS_LIBS) $(MCE_LIBS) -libmce_plugin_la_DEPENDENCIES = EXTRA_LTLIBRARIES += libmce_plugin.la libvlc_LTLIBRARIES += $(LTLIBmce) diff --git a/modules/mmx/Modules.am b/modules/mmx/Modules.am index 4ff1cdcce3ea..e4dec7dea5f1 100644 --- a/modules/mmx/Modules.am +++ b/modules/mmx/Modules.am @@ -5,21 +5,18 @@ libi420_rgb_mmx_plugin_la_SOURCES = \ i420_rgb_mmx.h libi420_rgb_mmx_plugin_la_CFLAGS = $(AM_CFLAGS) libi420_rgb_mmx_plugin_la_LIBADD = $(AM_LIBADD) -libi420_rgb_mmx_plugin_la_DEPENDENCIES = libi420_yuy2_mmx_plugin_la_SOURCES = \ ../video_chroma/i420_yuy2.c \ ../video_chroma/i420_yuy2.h libi420_yuy2_mmx_plugin_la_CFLAGS = $(AM_CFLAGS) libi420_yuy2_mmx_plugin_la_LIBADD = $(AM_LIBADD) -libi420_yuy2_mmx_plugin_la_DEPENDENCIES = libi422_yuy2_mmx_plugin_la_SOURCES = \ ../video_chroma/i422_yuy2.c \ ../video_chroma/i422_yuy2.h libi422_yuy2_mmx_plugin_la_CFLAGS = $(AM_CFLAGS) libi422_yuy2_mmx_plugin_la_LIBADD = $(AM_LIBADD) -libi422_yuy2_mmx_plugin_la_DEPENDENCIES = libvlc_LTLIBRARIES += \ libi420_rgb_mmx_plugin.la \ diff --git a/modules/mux/Modules.am b/modules/mux/Modules.am index b166cf39797b..beb6dd82b241 100644 --- a/modules/mux/Modules.am +++ b/modules/mux/Modules.am @@ -22,7 +22,6 @@ libmux_ts_plugin_la_SOURCES = \ mpeg/ts.c mpeg/bits.h libmux_ts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS) libmux_ts_plugin_la_LIBADD = $(AM_LIBADD) $(DVBPSI_LIBS) -libmux_ts_plugin_la_DEPENDENCIES = if HAVE_DVBPSI libvlc_LTLIBRARIES += libmux_ts_plugin.la endif diff --git a/modules/services_discovery/Modules.am b/modules/services_discovery/Modules.am index e35ecf88e863..b4f30503871c 100644 --- a/modules/services_discovery/Modules.am +++ b/modules/services_discovery/Modules.am @@ -10,7 +10,6 @@ libpulselist_plugin_la_SOURCES = \ pulse.c libpulselist_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS) libpulselist_plugin_la_LIBADD = $(AM_LIBADD) $(PULSE_LIBS) -libpulselist_plugin_la_DEPENDENCIES = if HAVE_PULSE libvlc_LTLIBRARIES += libpulselist_plugin.la endif @@ -18,7 +17,6 @@ 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_DEPENDENCIES = if HAVE_ALSA libudev_plugin_la_CFLAGS += $(ALSA_CFLAGS) -DHAVE_ALSA libudev_plugin_la_LIBADD += $(ALSA_LIBS) @@ -29,7 +27,6 @@ libxcb_apps_plugin_la_CFLAGS = $(AM_CFLAGS) \ $(XCB_CFLAGS) libxcb_apps_plugin_la_LIBADD = $(AM_LIBADD) \ $(XCB_LIBS) -libxcb_apps_plugin_la_DEPENDENCIES = if HAVE_XCB libvlc_LTLIBRARIES += libxcb_apps_plugin.la endif @@ -37,7 +34,6 @@ endif libwindrive_plugin_la_SOURCES = windrive.c libwindrive_plugin_la_CFLAGS = $(AM_CFLAGS) libwindrive_plugin_la_LIBADD = $(AM_LIBADD) -libwindrive_plugin_la_DEPENDENCIES = if HAVE_WIN32 libvlc_LTLIBRARIES += libwindrive_plugin.la endif @@ -45,7 +41,6 @@ endif libos2drive_plugin_la_SOURCES = os2drive.c libos2drive_plugin_la_CFLAGS = $(AM_CFLAGS) libos2drive_plugin_la_LIBADD = $(AM_LIBADD) -libos2drive_plugin_la_DEPENDENCIES = if HAVE_OS2 libvlc_LTLIBRARIES += libos2drive_plugin.la endif diff --git a/modules/sse2/Modules.am b/modules/sse2/Modules.am index ac9223fb8e55..2d384452c6d0 100644 --- a/modules/sse2/Modules.am +++ b/modules/sse2/Modules.am @@ -5,21 +5,18 @@ libi420_rgb_sse2_plugin_la_SOURCES = \ ../mmx/i420_rgb_mmx.h libi420_rgb_sse2_plugin_la_CFLAGS = $(AM_CFLAGS) libi420_rgb_sse2_plugin_la_LIBADD = $(AM_LIBADD) -libi420_rgb_sse2_plugin_la_DEPENDENCIES = libi420_yuy2_sse2_plugin_la_SOURCES = \ ../video_chroma/i420_yuy2.c \ ../video_chroma/i420_yuy2.h libi420_yuy2_sse2_plugin_la_CFLAGS = $(AM_CFLAGS) libi420_yuy2_sse2_plugin_la_LIBADD = $(AM_LIBADD) -libi420_yuy2_sse2_plugin_la_DEPENDENCIES = libi422_yuy2_sse2_plugin_la_SOURCES = \ ../video_chroma/i422_yuy2.c \ ../video_chroma/i422_yuy2.h libi422_yuy2_sse2_plugin_la_CFLAGS = $(AM_CFLAGS) libi422_yuy2_sse2_plugin_la_LIBADD = $(AM_LIBADD) -libi422_yuy2_sse2_plugin_la_DEPENDENCIES = libvlc_LTLIBRARIES += \ libi420_rgb_sse2_plugin.la \ diff --git a/modules/stream_filter/Modules.am b/modules/stream_filter/Modules.am index c258add8b9d3..849f8e8f93fc 100644 --- a/modules/stream_filter/Modules.am +++ b/modules/stream_filter/Modules.am @@ -11,7 +11,6 @@ if HAVE_GCRYPT libstream_filter_httplive_plugin_la_SOURCES = httplive.c libstream_filter_httplive_plugin_la_CFLAGS = $(AM_CFLAGS) $(GCRYPT_CFLAGS) libstream_filter_httplive_plugin_la_LIBADD = $(AM_LIBADD) $(GCRYPT_LIBS) -lgpg-error -libstream_filter_httplive_plugin_la_DEPENDENCIES = libvlc_LTLIBRARIES += libstream_filter_httplive_plugin.la endif diff --git a/modules/stream_out/Modules.am b/modules/stream_out/Modules.am index 41aad3bd2a6b..022f06ef830c 100644 --- a/modules/stream_out/Modules.am +++ b/modules/stream_out/Modules.am @@ -42,21 +42,18 @@ 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_DEPENDENCIES = if HAVE_GCRYPT SRTP_CFLAGS = -I$(top_srcdir)/modules/access/rtp SRTP_LIBS = $(top_builddir)/modules/access/rtp/libvlc_srtp.la libstream_out_rtp_plugin_la_CFLAGS += -DHAVE_SRTP $(SRTP_CFLAGS) \ $(GCRYPT_CFLAGS) libstream_out_rtp_plugin_la_LIBADD += $(SRTP_LIBS) $(GCRYPT_LIBS) -libstream_out_rtp_plugin_la_DEPENDENCIES += $(SRTP_LIBS) 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_DEPENDENCIES = if HAVE_GCRYPT libvlc_LTLIBRARIES += libstream_out_raop_plugin.la endif diff --git a/modules/video_chroma/Modules.am b/modules/video_chroma/Modules.am index 583b2de28cac..f7195f935116 100644 --- a/modules/video_chroma/Modules.am +++ b/modules/video_chroma/Modules.am @@ -48,5 +48,4 @@ libvlc_LTLIBRARIES += \ 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_DEPENDENCIES = EXTRA_LTLIBRARIES += libchroma_omx_plugin.la diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am index 9b559b1f469b..54aec5676f0b 100644 --- a/modules/video_filter/Modules.am +++ b/modules/video_filter/Modules.am @@ -30,7 +30,6 @@ libdeinterlace_plugin_la_SOURCES = \ deinterlace/algo_ivtc.c deinterlace/algo_ivtc.h libdeinterlace_plugin_la_CFLAGS = $(AM_CFLAGS) libdeinterlace_plugin_la_LIBADD = $(AM_LIBADD) -libdeinterlace_plugin_la_DEPENDENCIES = if HAVE_NEON libdeinterlace_plugin_la_SOURCES += deinterlace/merge_arm.S libdeinterlace_plugin_la_CFLAGS += -DCAN_COMPILE_ARM @@ -40,7 +39,6 @@ libvlc_LTLIBRARIES += libdeinterlace_plugin.la libosdmenu_plugin_la_SOURCES = osdmenu.c libosdmenu_plugin_la_CFLAGS = $(AM_CFLAGS) -DPKGDATADIR=\"$(vlcdatadir)\" libosdmenu_plugin_la_LIBADD = $(AM_LIBADD) -libosdmenu_plugin_la_DEPENDENCIES = if BUILD_OSDMENU libvlc_LTLIBRARIES += libosdmenu_plugin.la endif @@ -48,7 +46,6 @@ 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_DEPENDENCIES = if HAVE_GCRYPT libvlc_LTLIBRARIES += libremoteosd_plugin.la endif diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am index 9ffde18fcff0..f73e6fba5c36 100644 --- a/modules/video_output/Modules.am +++ b/modules/video_output/Modules.am @@ -19,17 +19,14 @@ SOURCES_android_surface = androidsurface.c 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_DEPENDENCIES = 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_DEPENDENCIES = 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_DEPENDENCIES = EXTRA_LTLIBRARIES += \ libgles2_plugin.la \ @@ -49,7 +46,6 @@ libxcb_x11_plugin_la_CFLAGS = $(AM_CFLAGS) \ $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) libxcb_x11_plugin_la_LIBADD = $(AM_LIBADD) \ $(XCB_LIBS) $(XCB_SHM_LIBS) -libxcb_x11_plugin_la_DEPENDENCIES = libxcb_xv_plugin_la_SOURCES = \ xcb/xcb_vlc.h \ @@ -60,7 +56,6 @@ libxcb_xv_plugin_la_CFLAGS = $(AM_CFLAGS) \ $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_XV_CFLAGS) libxcb_xv_plugin_la_LIBADD = $(AM_LIBADD) \ $(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_XV_LIBS) -libxcb_xv_plugin_la_DEPENDENCIES = libxcb_glx_plugin_la_SOURCES = \ xcb/xcb_vlc.h \ @@ -72,7 +67,6 @@ libxcb_glx_plugin_la_CFLAGS = $(AM_CFLAGS) \ $(XCB_CFLAGS) $(GL_CFLAGS) libxcb_glx_plugin_la_LIBADD = $(AM_LIBADD) \ $(XCB_LIBS) $(GL_LIBS) $(X_LIBS) $(X_PRE_LIBS) -lX11 -libxcb_glx_plugin_la_DEPENDENCIES = 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) \ @@ -84,7 +78,6 @@ libxcb_window_plugin_la_LIBADD = $(AM_LIBADD) \ $(XPROTO_LIBS) \ $(XCB_LIBS) \ $(XCB_KEYSYMS_LIBS) -libxcb_window_plugin_la_DEPENDENCIES = if HAVE_XCB libvlc_LTLIBRARIES += \ @@ -102,7 +95,6 @@ libvlc_LTLIBRARIES += \ libdrawable_plugin_la_SOURCES = drawable.c libdrawable_plugin_la_CFLAGS = $(AM_CFLAGS) libdrawable_plugin_la_LIBADD = $(AM_LIBADD) -libdrawable_plugin_la_DEPENDENCIES = if HAVE_WIN32 libvlc_LTLIBRARIES += libdrawable_plugin.la endif @@ -115,7 +107,6 @@ endif libkva_plugin_la_SOURCES = kva.c libkva_plugin_la_CFLAGS = $(AM_CFLAGS) libkva_plugin_la_LIBADD = $(AM_LIBADD) $(KVA_LIBS) -libkva_plugin_la_DEPENDENCIES = if HAVE_KVA libvlc_LTLIBRARIES += libkva_plugin.la endif @@ -127,7 +118,6 @@ libegl_plugin_la_LIBADD = $(AM_LIBADD) $(EGL_LIBS) if !HAVE_WIN32 libegl_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11 endif -libegl_plugin_la_DEPENDENCIES = EXTRA_LTLIBRARIES += libegl_plugin.la libvlc_LTLIBRARIES += $(LTLIBegl) @@ -140,7 +130,6 @@ if !HAVE_DARWIN libcaca_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIBS) -lX11 endif endif -libcaca_plugin_la_DEPENDENCIES = EXTRA_LTLIBRARIES += libcaca_plugin.la libvlc_LTLIBRARIES += $(LTLIBcaca) @@ -148,7 +137,6 @@ libvlc_LTLIBRARIES += $(LTLIBcaca) libvdummy_plugin_la_SOURCES = vdummy.c libvdummy_plugin_la_CFLAGS = $(AM_CFLAGS) libvdummy_plugin_la_LIBADD = $(AM_LIBADD) -libvdummy_plugin_la_DEPENDENCIES = libvlc_LTLIBRARIES += \ libvdummy_plugin.la \ diff --git a/modules/video_output/msw/Modules.am b/modules/video_output/msw/Modules.am index d74aeebbd4ab..132d9a5880c7 100644 --- a/modules/video_output/msw/Modules.am +++ b/modules/video_output/msw/Modules.am @@ -15,7 +15,6 @@ libdirectdraw_plugin_la_SOURCES = \ $(NULL) libdirectdraw_plugin_la_CFLAGS = $(AM_CFLAGS) libdirectdraw_plugin_la_LIBADD = $(AM_LIBADD) -luser32 -lgdi32 -lole32 -luuid -libdirectdraw_plugin_la_DEPENDENCIES = if HAVE_DIRECTX libvlc_LTLIBRARIES += libdirectdraw_plugin.la endif -- GitLab