From 640d0794a0840343aa2c14e8cb8d8abfe37a22df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> Date: Sat, 14 Sep 2013 19:29:35 +0300 Subject: [PATCH] modules: factor Makefile statement --- modules/access/Modules.am | 1 - modules/audio_filter/Modules.am | 2 -- modules/codec/Modules.am | 2 -- modules/common.am | 2 ++ modules/control/Modules.am | 2 -- modules/demux/Modules.am | 2 -- modules/gui/qt4/Makefile.am | 1 - modules/gui/skins2/Modules.am | 2 -- modules/hw/vdpau/Makefile.am | 1 - modules/lua/Modules.am | 2 -- modules/meta_engine/Modules.am | 2 -- modules/misc/Modules.am | 2 -- modules/mux/Modules.am | 2 -- modules/services_discovery/Modules.am | 2 -- modules/stream_filter/Makefile.am | 1 - modules/stream_out/Modules.am | 2 -- modules/video_chroma/Makefile.am | 2 -- modules/video_filter/Modules.am | 2 -- modules/video_output/Modules.am | 1 - modules/visualization/Modules.am | 2 -- 20 files changed, 2 insertions(+), 33 deletions(-) diff --git a/modules/access/Modules.am b/modules/access/Modules.am index 3ac4ccd0d3e2..4749027e8778 100644 --- a/modules/access/Modules.am +++ b/modules/access/Modules.am @@ -1,4 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects SUBDIRS = rtp noinst_LTLIBRARIES = diff --git a/modules/audio_filter/Modules.am b/modules/audio_filter/Modules.am index d59db0eac299..d3454e9559e8 100644 --- a/modules/audio_filter/Modules.am +++ b/modules/audio_filter/Modules.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects - SOURCES_equalizer = equalizer.c equalizer_presets.h SOURCES_compressor = compressor.c SOURCES_karaoke = karaoke.c diff --git a/modules/codec/Modules.am b/modules/codec/Modules.am index 27fcbadf1455..876ae613b602 100644 --- a/modules/codec/Modules.am +++ b/modules/codec/Modules.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects - noinst_HEADERS = SOURCES_a52 = a52.c a52.h diff --git a/modules/common.am b/modules/common.am index e525479745c8..7412a7347a29 100644 --- a/modules/common.am +++ b/modules/common.am @@ -5,6 +5,8 @@ # # Authors: Sam Hocevar <sam@zoy.org> +AUTOMAKE_OPTIONS = subdir-objects + NULL = libvlcdir = $(vlclibdir)/plugins/$(basedir) BUILT_SOURCES = diff --git a/modules/control/Modules.am b/modules/control/Modules.am index cb50c8689b2a..30549d883ee8 100644 --- a/modules/control/Modules.am +++ b/modules/control/Modules.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects - SOURCES_dummy = dummy.c SOURCES_gestures = gestures.c SOURCES_netsync = netsync.c diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am index 4259231f2580..edd5bed46d10 100644 --- a/modules/demux/Modules.am +++ b/modules/demux/Modules.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects - SOURCES_flacsys = flac.c xiph_metadata.h xiph_metadata.c SOURCES_ogg = ogg.c ogg.h oggseek.c oggseek.h xiph_metadata.h xiph.h xiph_metadata.c SOURCES_demuxdump = demuxdump.c diff --git a/modules/gui/qt4/Makefile.am b/modules/gui/qt4/Makefile.am index 9530b74b190d..306acd9e48bc 100644 --- a/modules/gui/qt4/Makefile.am +++ b/modules/gui/qt4/Makefile.am @@ -13,7 +13,6 @@ include $(top_srcdir)/modules/common.am # For each ressource (icon, png, ...) # - Add it to DEPS_res -AUTOMAKE_OPTIONS = subdir-objects SUFFIXES = .ui .h .hpp .moc.cpp libqt4_plugin_la_CXXFLAGS = $(AM_CXXFLAGS) $(QT_CFLAGS) diff --git a/modules/gui/skins2/Modules.am b/modules/gui/skins2/Modules.am index 21a355869e4d..a962ab244efb 100644 --- a/modules/gui/skins2/Modules.am +++ b/modules/gui/skins2/Modules.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects - SOURCES_skins2 = \ commands/async_queue.cpp \ commands/async_queue.hpp \ diff --git a/modules/hw/vdpau/Makefile.am b/modules/hw/vdpau/Makefile.am index 7c44fa90161e..c8dda479155b 100644 --- a/modules/hw/vdpau/Makefile.am +++ b/modules/hw/vdpau/Makefile.am @@ -1,4 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects basedir = vdpau include $(top_srcdir)/modules/common.am diff --git a/modules/lua/Modules.am b/modules/lua/Modules.am index 05c255a6aebe..4a4dc70be1b0 100644 --- a/modules/lua/Modules.am +++ b/modules/lua/Modules.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects - SOURCES_lua = \ extension.c \ extension.h \ diff --git a/modules/meta_engine/Modules.am b/modules/meta_engine/Modules.am index 1e475b88aa6a..b9fd77514f8a 100644 --- a/modules/meta_engine/Modules.am +++ b/modules/meta_engine/Modules.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects - SOURCES_folder = folder.c SOURCES_taglib = taglib.cpp ../demux/xiph_metadata.h ../demux/xiph_metadata.c diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am index c706a6b3bd02..d2ed1e4cbef6 100644 --- a/modules/misc/Modules.am +++ b/modules/misc/Modules.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects - SOURCES_vod_rtsp = rtsp.c SOURCES_audioscrobbler = audioscrobbler.c SOURCES_fingerprinter = fingerprinter.c \ diff --git a/modules/mux/Modules.am b/modules/mux/Modules.am index 291c84c1c07e..742d4827622a 100644 --- a/modules/mux/Modules.am +++ b/modules/mux/Modules.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects - SOURCES_mux_dummy = dummy.c SOURCES_mux_avi = avi.c SOURCES_mux_ogg = ogg.c diff --git a/modules/services_discovery/Modules.am b/modules/services_discovery/Modules.am index 8e12934c22d9..07e2b4204b58 100644 --- a/modules/services_discovery/Modules.am +++ b/modules/services_discovery/Modules.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects - SOURCES_upnp = upnp.cpp upnp.hpp SOURCES_bonjour = bonjour.c SOURCES_podcast = podcast.c diff --git a/modules/stream_filter/Makefile.am b/modules/stream_filter/Makefile.am index ce1408a16361..b97313b8d8c2 100644 --- a/modules/stream_filter/Makefile.am +++ b/modules/stream_filter/Makefile.am @@ -1,4 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects basedir = stream_filter include $(top_srcdir)/modules/common.am libvlc_LTLIBRARIES = diff --git a/modules/stream_out/Modules.am b/modules/stream_out/Modules.am index 0bcbd62c467d..7103932759db 100644 --- a/modules/stream_out/Modules.am +++ b/modules/stream_out/Modules.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects - SOURCES_stream_out_dummy = dummy.c SOURCES_stream_out_delay = delay.c SOURCES_stream_out_description = description.c diff --git a/modules/video_chroma/Makefile.am b/modules/video_chroma/Makefile.am index 1eed8720c171..9cf630bdd761 100644 --- a/modules/video_chroma/Makefile.am +++ b/modules/video_chroma/Makefile.am @@ -1,8 +1,6 @@ basedir = video_chroma include $(top_srcdir)/modules/common.am -AUTOMAKE_OPTIONS = subdir-objects - libchain_plugin_la_SOURCES = chain.c libchain_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am index d5c605a24742..f8431d17c965 100644 --- a/modules/video_filter/Modules.am +++ b/modules/video_filter/Modules.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects - SOURCES_mosaic = mosaic.c mosaic.h SOURCES_transform = transform.c SOURCES_invert = invert.c diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am index e55c1e5267c1..ee7f488d18de 100644 --- a/modules/video_output/Modules.am +++ b/modules/video_output/Modules.am @@ -1,4 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects AM_LIBTOOLFLAGS=--tag=CC noinst_LTLIBRARIES = diff --git a/modules/visualization/Modules.am b/modules/visualization/Modules.am index 1303d3f4679d..ffeceb538820 100644 --- a/modules/visualization/Modules.am +++ b/modules/visualization/Modules.am @@ -1,5 +1,3 @@ -AUTOMAKE_OPTIONS = subdir-objects - SOURCES_goom = goom.c SOURCES_projectm = projectm.cpp -- GitLab