modules: factor Makefile statement

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 3ac4ccd0d3e287ab302b8ffb6d866d1ffef7e7d0..4749027e87788ed1492f321a69a77a49b01f2826 100644 (file)
--- 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 d59db0eac299b75c5d64ccb1093dcb6eee04e1f9..d3454e9559e8d5cb04256ebfbdba23ede9b4da57 100644 (file)
--- 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 27fcbadf14551869818e2df7db43a1e63b386f87..876ae613b602656bced1cd641cc7ab97f59beda2 100644 (file)
--- 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 e525479745c870f57d32162fbe4241db81f1414f..7412a7347a295c3cdb469cc76520e2142283a05a 100644 (file)
--- 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 cb50c8689b2af66982133404558da82c8badd1fd..30549d883ee8da8f5e33506413ea308a242d2b7b 100644 (file)
--- 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 4259231f25809367963ed7588c01dfb304e67d17..edd5bed46d10a8f7602d86a3496c70a59e697299 100644 (file)
--- 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 9530b74b190d7a9e6b49fe50737a017f44197e8b..306acd9e48bc5acc69735580bd9f48791e54e017 100644 (file)
--- 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 21a355869e4de8459e9d403d28197f0b6463d430..a962ab244efb1e5d546fd36da8702059aac00b11 100644 (file)
--- 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 7c44fa90161e2125735a45ba74bebebd4a44b5f3..c8dda479155be02e95efb29031918aafde779e0c 100644 (file)
--- 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 05c255a6aebe4df9ad1860d93817d3c539219105..4a4dc70be1b0de6bc7ef6de9e5b52a1c97113464 100644 (file)
--- 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 1e475b88aa6aaaf33917d2a3209ae37661006705..b9fd77514f8ab9a24c62b70be60d7f2ee46f90e8 100644 (file)
--- 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 c706a6b3bd0242531623d02001a61d3eead2d9f4..d2ed1e4cbef6121c02dcbafa33420cb5a55bf480 100644 (file)
--- 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 291c84c1c07e5cb191b0335718332e6941fcb271..742d4827622acda77b6fc515e591ffecec546d79 100644 (file)
--- 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 8e12934c22d996216f0cdfbf01a07c5891bb1269..07e2b4204b58188197d069e0d1fb9754643ad9da 100644 (file)
--- 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 ce1408a16361ca42f077d4d28d9de2364c7a8a8b..b97313b8d8c210bc7790e6a20a7cb4bca3ecd9e0 100644 (file)
--- 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 0bcbd62c467d9688b212c60fa25f2f03a4b81124..7103932759db507383a240679e7c4668404f947d 100644 (file)
--- 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 1eed8720c171933cb76158ecaf4ad32d004844e5..9cf630bdd76152bbcd53a3d86cde888c6fdf0254 100644 (file)
--- 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 d5c605a24742987a6fd275bf028fec82589d9a72..f8431d17c965164650434430794f2b8f1def8e17 100644 (file)
--- 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 e55c1e5267c186e88fb752316d00ce0b0e010545..ee7f488d18de3d00949897be227be8366511f8d7 100644 (file)
--- 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 1303d3f4679ddc3d7b9e76c25a83ce5dfe1cc0f7..ffeceb5388209d3adb6d479559fce532b008cb3c 100644 (file)
--- 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