From d3bd87aaf39384e888c4e06f7ecdf46e4efc41c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> Date: Thu, 5 Sep 2013 22:20:01 +0300 Subject: [PATCH] Add subdir-objects automake option where appropriate Makes version 1.14 happy. --- lib/Makefile.am | 2 +- modules/access/Modules.am | 1 + modules/altivec/Makefile.am | 1 + modules/audio_filter/Modules.am | 2 ++ modules/codec/Modules.am | 2 ++ modules/control/Modules.am | 2 ++ modules/demux/Modules.am | 2 ++ 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/mmx/Makefile.am | 1 + modules/mux/Modules.am | 2 ++ modules/services_discovery/Modules.am | 2 ++ modules/sse2/Makefile.am | 1 + modules/stream_filter/Makefile.am | 1 + modules/stream_out/Modules.am | 2 ++ modules/video_chroma/Modules.am | 2 ++ modules/video_filter/Modules.am | 2 ++ modules/video_output/Modules.am | 1 + modules/visualization/Modules.am | 2 ++ 22 files changed, 36 insertions(+), 1 deletion(-) diff --git a/lib/Makefile.am b/lib/Makefile.am index 72dc66ce29ca..b41fdb7c1f59 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,5 +1,5 @@ +AUTOMAKE_OPTIONS = subdir-objects pkgconfigdir = $(libdir)/pkgconfig - AM_CPPFLAGS = -DMODULE_STRING=\"libvlc\" AM_CFLAGS = $(CFLAGS_libvlc) diff --git a/modules/access/Modules.am b/modules/access/Modules.am index 8f339f802ef1..1f6c57454c98 100644 --- a/modules/access/Modules.am +++ b/modules/access/Modules.am @@ -1,3 +1,4 @@ +AUTOMAKE_OPTIONS = subdir-objects SUBDIRS = rtp noinst_LTLIBRARIES = diff --git a/modules/altivec/Makefile.am b/modules/altivec/Makefile.am index cf28a0370786..a552ec94f105 100644 --- a/modules/altivec/Makefile.am +++ b/modules/altivec/Makefile.am @@ -1,3 +1,4 @@ +AUTOMAKE_OPTIONS = subdir-objects basedir = altivec include $(top_srcdir)/modules/common.am diff --git a/modules/audio_filter/Modules.am b/modules/audio_filter/Modules.am index d3454e9559e8..d59db0eac299 100644 --- a/modules/audio_filter/Modules.am +++ b/modules/audio_filter/Modules.am @@ -1,3 +1,5 @@ +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 dff5bf387dae..0e46b7b7906a 100644 --- a/modules/codec/Modules.am +++ b/modules/codec/Modules.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS = subdir-objects + noinst_HEADERS = SOURCES_a52 = a52.c a52.h diff --git a/modules/control/Modules.am b/modules/control/Modules.am index 30549d883ee8..cb50c8689b2a 100644 --- a/modules/control/Modules.am +++ b/modules/control/Modules.am @@ -1,3 +1,5 @@ +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 fc6c714de22a..f842a412f96e 100644 --- a/modules/demux/Modules.am +++ b/modules/demux/Modules.am @@ -1,3 +1,5 @@ +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/skins2/Modules.am b/modules/gui/skins2/Modules.am index a962ab244efb..21a355869e4d 100644 --- a/modules/gui/skins2/Modules.am +++ b/modules/gui/skins2/Modules.am @@ -1,3 +1,5 @@ +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 0cbf07c5f40a..131cd9c9b3ae 100644 --- a/modules/hw/vdpau/Makefile.am +++ b/modules/hw/vdpau/Makefile.am @@ -1,3 +1,4 @@ +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 4a4dc70be1b0..05c255a6aebe 100644 --- a/modules/lua/Modules.am +++ b/modules/lua/Modules.am @@ -1,3 +1,5 @@ +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 b9fd77514f8a..1e475b88aa6a 100644 --- a/modules/meta_engine/Modules.am +++ b/modules/meta_engine/Modules.am @@ -1,3 +1,5 @@ +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 d2ed1e4cbef6..c706a6b3bd02 100644 --- a/modules/misc/Modules.am +++ b/modules/misc/Modules.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS = subdir-objects + SOURCES_vod_rtsp = rtsp.c SOURCES_audioscrobbler = audioscrobbler.c SOURCES_fingerprinter = fingerprinter.c \ diff --git a/modules/mmx/Makefile.am b/modules/mmx/Makefile.am index f9c7f0a32a8d..863592257d66 100644 --- a/modules/mmx/Makefile.am +++ b/modules/mmx/Makefile.am @@ -1,3 +1,4 @@ +AUTOMAKE_OPTIONS = subdir-objects basedir = mmx include $(top_srcdir)/modules/common.am diff --git a/modules/mux/Modules.am b/modules/mux/Modules.am index 742d4827622a..291c84c1c07e 100644 --- a/modules/mux/Modules.am +++ b/modules/mux/Modules.am @@ -1,3 +1,5 @@ +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 82a08a68ad6d..4f36784660c9 100644 --- a/modules/services_discovery/Modules.am +++ b/modules/services_discovery/Modules.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS = subdir-objects + SOURCES_upnp = upnp.cpp upnp.hpp SOURCES_bonjour = bonjour.c SOURCES_podcast = podcast.c diff --git a/modules/sse2/Makefile.am b/modules/sse2/Makefile.am index b9effd78c19b..b771db9dc1e7 100644 --- a/modules/sse2/Makefile.am +++ b/modules/sse2/Makefile.am @@ -1,3 +1,4 @@ +AUTOMAKE_OPTIONS = subdir-objects basedir = sse2 include $(top_srcdir)/modules/common.am diff --git a/modules/stream_filter/Makefile.am b/modules/stream_filter/Makefile.am index b97313b8d8c2..ce1408a16361 100644 --- a/modules/stream_filter/Makefile.am +++ b/modules/stream_filter/Makefile.am @@ -1,3 +1,4 @@ +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 7103932759db..0bcbd62c467d 100644 --- a/modules/stream_out/Modules.am +++ b/modules/stream_out/Modules.am @@ -1,3 +1,5 @@ +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/Modules.am b/modules/video_chroma/Modules.am index 2c49fc9b2334..6bdaa8462f23 100644 --- a/modules/video_chroma/Modules.am +++ b/modules/video_chroma/Modules.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS = subdir-objects + SOURCES_i420_rgb = \ i420_rgb.c \ i420_rgb.h \ diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am index f8431d17c965..d5c605a24742 100644 --- a/modules/video_filter/Modules.am +++ b/modules/video_filter/Modules.am @@ -1,3 +1,5 @@ +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 5696f5be3682..cc3a08b6b53a 100644 --- a/modules/video_output/Modules.am +++ b/modules/video_output/Modules.am @@ -1,3 +1,4 @@ +AUTOMAKE_OPTIONS = subdir-objects AM_LIBTOOLFLAGS=--tag=CC SOURCES_aa = aa.c diff --git a/modules/visualization/Modules.am b/modules/visualization/Modules.am index ffeceb538820..1303d3f4679d 100644 --- a/modules/visualization/Modules.am +++ b/modules/visualization/Modules.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS = subdir-objects + SOURCES_goom = goom.c SOURCES_projectm = projectm.cpp -- GitLab