[vlc-commits] Add subdir-objects automake option where appropriate

Rémi Denis-Courmont git at videolan.org
Thu Sep 5 21:34:24 CEST 2013 

vlc/vlc-2.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Sep  5 22:20:01 2013 +0300| [f38cb2c7e18cc0b9028ac15baacc0a4a64168f4c] | committer: Rémi Denis-Courmont

Add subdir-objects automake option where appropriate

Makes version 1.14 happy.

(cherry picked from commit d3bd87aaf39384e888c4e06f7ecdf46e4efc41c1)

Conflicts:
	modules/altivec/Modules.am
	modules/hw/vdpau/Makefile.am
	modules/mmx/Modules.am
	modules/sse2/Modules.am
	modules/stream_filter/Modules.am

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=f38cb2c7e18cc0b9028ac15baacc0a4a64168f4c
---

 lib/Makefile.am                       |    2 +-
 modules/access/Modules.am             |    1 +
 modules/altivec/Modules.am            |    2 ++
 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/lua/Modules.am                |    2 ++
 modules/meta_engine/Modules.am        |    2 ++
 modules/misc/Modules.am               |    2 ++
 modules/mmx/Modules.am                |    2 ++
 modules/mux/Modules.am                |    2 ++
 modules/services_discovery/Modules.am |    2 ++
 modules/sse2/Modules.am               |    2 ++
 modules/stream_filter/Modules.am      |    2 ++
 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 ++
 21 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 72dc66c..b41fdb7 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 35a49b9..8c988f4 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/Modules.am b/modules/altivec/Modules.am
index 5178b01..be6bb49 100644
--- a/modules/altivec/Modules.am
+++ b/modules/altivec/Modules.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 libi420_yuy2_altivec_plugin_la_SOURCES = \
         ../video_chroma/i420_yuy2.c \
 	../video_chroma/i420_yuy2.h
diff --git a/modules/audio_filter/Modules.am b/modules/audio_filter/Modules.am
index 4963a39..16f9cc8 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 a93dac7..27f00c8 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 90e7947..9517d50 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 c885e4d..09360f4 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 a962ab2..21a3558 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/lua/Modules.am b/modules/lua/Modules.am
index 4a4dc70..05c255a 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 b9fd775..1e475b8 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 d2d6a22..2755dfe 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/Modules.am b/modules/mmx/Modules.am
index e4dec7d..9c26731 100644
--- a/modules/mmx/Modules.am
+++ b/modules/mmx/Modules.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 libi420_rgb_mmx_plugin_la_SOURCES = \
         ../video_chroma/i420_rgb.c \
 	../video_chroma/i420_rgb.h \
diff --git a/modules/mux/Modules.am b/modules/mux/Modules.am
index 85aed68..3426f88 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 241eb68..214f6ab 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/Modules.am b/modules/sse2/Modules.am
index 41e2bb2..399a118 100644
--- a/modules/sse2/Modules.am
+++ b/modules/sse2/Modules.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 libi420_rgb_sse2_plugin_la_SOURCES = \
         ../video_chroma/i420_rgb.c \
 	../video_chroma/i420_rgb.h \
diff --git a/modules/stream_filter/Modules.am b/modules/stream_filter/Modules.am
index 805670e..5ba14e1 100644
--- a/modules/stream_filter/Modules.am
+++ b/modules/stream_filter/Modules.am
@@ -1,3 +1,5 @@
+AUTOMAKE_OPTIONS = subdir-objects
+
 libdecomp_plugin_la_SOURCES = decomp.c
 libdecomp_plugin_la_CFLAGS = $(AM_CFLAGS)
 libdecomp_plugin_la_LIBADD = $(AM_LIBADD)
diff --git a/modules/stream_out/Modules.am b/modules/stream_out/Modules.am
index 187b799..6c1627a 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 f7195f9..3bd0eff 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 6bb5eac..9fbe1bd 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 7efe10a..e49e43f 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 af03750..7f8cf44 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

More information about the vlc-commits mailing list