diff --git a/lib/Makefile.am b/lib/Makefile.am index 72dc66ce29ca3007c0197e288de56cf70e180342..b41fdb7c1f5980a2a6ae470dd28badf6549c1445 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 8f339f802ef14e9ea06be86848791b7a85efb9c2..1f6c57454c98956fe4fccf1ae591e9351cf0a273 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 cf28a0370786391a22a24b875e4c093fab26403d..a552ec94f1056195b86d9b67236b2a4f8700c1e0 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 d3454e9559e8d5cb04256ebfbdba23ede9b4da57..d59db0eac299b75c5d64ccb1093dcb6eee04e1f9 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 dff5bf387daeda4c287df374c50388ec5ce690e1..0e46b7b7906a198d4e2d31bd03769589cb0b40e6 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 30549d883ee8da8f5e33506413ea308a242d2b7b..cb50c8689b2af66982133404558da82c8badd1fd 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 fc6c714de22a0af9c866ee135a991fe4171114cb..f842a412f96e528aa0bccc5cead302773d3e0c5e 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 a962ab244efb1e5d546fd36da8702059aac00b11..21a355869e4de8459e9d403d28197f0b6463d430 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 0cbf07c5f40a9f01fa7da922bc1caaba46fbec09..131cd9c9b3aec7478045e31e1a168b31ecb33144 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 4a4dc70be1b0de6bc7ef6de9e5b52a1c97113464..05c255a6aebe4df9ad1860d93817d3c539219105 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 b9fd77514f8ab9a24c62b70be60d7f2ee46f90e8..1e475b88aa6aaaf33917d2a3209ae37661006705 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 d2ed1e4cbef6121c02dcbafa33420cb5a55bf480..c706a6b3bd0242531623d02001a61d3eead2d9f4 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 f9c7f0a32a8d85af44400f97ecb62dba139ff97c..863592257d6614286c0b3e71995918818e7fc903 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 742d4827622acda77b6fc515e591ffecec546d79..291c84c1c07e5cb191b0335718332e6941fcb271 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 82a08a68ad6df87e152412c873768cf1cd6cef00..4f36784660c921f7a6ef6655875617198ac8651a 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 b9effd78c19bd59ac1921dc345a6dfe54770ec51..b771db9dc1e7971037a841d5d6982681f87c7c8b 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 b97313b8d8c210bc7790e6a20a7cb4bca3ecd9e0..ce1408a16361ca42f077d4d28d9de2364c7a8a8b 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 7103932759db507383a240679e7c4668404f947d..0bcbd62c467d9688b212c60fa25f2f03a4b81124 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 2c49fc9b2334753e818f9e5efd4924e9a77e9d62..6bdaa8462f230c2616165d14ac190439d37b67b6 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 f8431d17c965164650434430794f2b8f1def8e17..d5c605a24742987a6fd275bf028fec82589d9a72 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 5696f5be3682d1107543e6304c80cd68810b1152..cc3a08b6b53af2c9265c897b5d992280247df8f6 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 ffeceb5388209d3adb6d479559fce532b008cb3c..1303d3f4679ddc3d7b9e76c25a83ce5dfe1cc0f7 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