[vlc-devel] commit: Don't use VLC_ADD_PLUGIN for common sout and packetizers plugins ( Rémi Denis-Courmont )
git version control
git at videolan.org
Mon Apr 28 22:25:44 CEST 2008
vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Mon Apr 28 23:26:46 2008 +0300| [469cfd7e0ee2e367ef639a6e8064337546314659]
Don't use VLC_ADD_PLUGIN for common sout and packetizers plugins
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=469cfd7e0ee2e367ef639a6e8064337546314659
---
configure.ac | 43 --------------------------------------
modules/access_output/Modules.am | 7 ++++++
modules/misc/Modules.am | 6 +++++
modules/mux/Modules.am | 9 ++++++++
modules/mux/mpeg/Modules.am | 2 +
modules/packetizer/Modules.am | 10 ++++++++
modules/stream_out/Modules.am | 15 +++++++++++++
7 files changed, 49 insertions(+), 43 deletions(-)
diff --git a/configure.ac b/configure.ac
index b76426d..00a416a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1290,12 +1290,6 @@ VLC_ADD_PLUGIN([access_filter_timeshift])
VLC_ADD_PLUGIN([access_filter_record])
VLC_ADD_PLUGIN([access_filter_dump])
VLC_ADD_PLUGIN([access_filter_bandwidth])
-dnl Packetizers:
-VLC_ADD_PLUGIN([packetizer_mpegvideo])
-VLC_ADD_PLUGIN([packetizer_h264])
-VLC_ADD_PLUGIN([packetizer_mpeg4video])
-VLC_ADD_PLUGIN([packetizer_mpeg4audio])
-VLC_ADD_PLUGIN([packetizer_vc1])
ALIASES="${ALIASES} cvlc"
@@ -1725,43 +1719,6 @@ dnl Stream output
dnl
AC_ARG_ENABLE(sout,
[ --enable-sout Stream output modules (default enabled)])
-if test "${enable_sout}" != "no"
-then
- dnl Access outputs:
- VLC_ADD_PLUGIN([access_output_dummy])
- VLC_ADD_PLUGIN([access_output_udp])
- VLC_ADD_PLUGIN([access_output_file])
- VLC_ADD_PLUGIN([access_output_http])
- dnl Muxers:
- VLC_ADD_PLUGIN([mux_ps])
- VLC_ADD_PLUGIN([mux_avi])
- VLC_ADD_PLUGIN([mux_mp4])
- VLC_ADD_PLUGIN([mux_asf])
- VLC_ADD_PLUGIN([mux_dummy])
- VLC_ADD_PLUGIN([mux_wav])
- VLC_ADD_PLUGIN([mux_mpjpeg])
- dnl Packetizers (FIXME: why are the others outside --enable-sout??):
- VLC_ADD_PLUGIN([packetizer_copy])
- dnl Stream outputs:
- VLC_ADD_PLUGIN([stream_out_dummy])
- VLC_ADD_PLUGIN([stream_out_standard])
- VLC_ADD_PLUGIN([stream_out_es])
- VLC_ADD_PLUGIN([stream_out_rtp])
- VLC_ADD_PLUGIN([stream_out_description])
- VLC_ADD_PLUGIN([stream_out_duplicate])
- VLC_ADD_PLUGIN([stream_out_display])
- VLC_ADD_PLUGIN([stream_out_transcode])
- VLC_ADD_PLUGIN([stream_out_bridge])
- VLC_ADD_PLUGIN([stream_out_mosaic_bridge])
- VLC_ADD_PLUGIN([stream_out_autodel])
- VLC_ADD_PLUGIN([stream_out_gather])
-# VLC_ADD_PLUGIN([stream_out_transrate])
- dnl Misc:
- VLC_ADD_PLUGIN([vod_rtsp])
- VLC_ADD_PLUGIN([profile_parser])
-
- AC_DEFINE(ENABLE_SOUT, 1, Define if you want the stream output support)
-fi
AM_CONDITIONAL(ENABLE_SOUT, [test "${enable_sout}" != "no"])
AC_ARG_ENABLE(switcher,
diff --git a/modules/access_output/Modules.am b/modules/access_output/Modules.am
index 5ea101a..709fe9d 100644
--- a/modules/access_output/Modules.am
+++ b/modules/access_output/Modules.am
@@ -3,3 +3,10 @@ SOURCES_access_output_file = file.c
SOURCES_access_output_udp = udp.c
SOURCES_access_output_http = http.c bonjour.c bonjour.h
SOURCES_access_output_shout = shout.c
+
+libvlc_LTLIBRARIES += \
+ libaccess_output_dummy_plugin.la \
+ libaccess_output_file_plugin.la \
+ libaccess_output_udp_plugin.la \
+ libaccess_output_http_plugin.la \
+ $(NULL)
diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am
index db282b6..961cec1 100644
--- a/modules/misc/Modules.am
+++ b/modules/misc/Modules.am
@@ -14,3 +14,9 @@ SOURCES_svg = svg.c
SOURCES_profile_parser = profile_parser.c
SOURCES_audioscrobbler = audioscrobbler.c
SOURCES_inhibit = inhibit.c
+
+if ENABLE_SOUT
+libvlc_LTLIBRARIES += \
+ libvod_rtsp_plugin.la \
+ libprofile_parser_plugin.la
+endif
diff --git a/modules/mux/Modules.am b/modules/mux/Modules.am
index 6c7ced9..eef5fcd 100644
--- a/modules/mux/Modules.am
+++ b/modules/mux/Modules.am
@@ -5,3 +5,12 @@ SOURCES_mux_mp4 = mp4.c
SOURCES_mux_asf = asf.c
SOURCES_mux_wav = wav.c
SOURCES_mux_mpjpeg = mpjpeg.c
+
+libvlc_LTLIBRARIES += \
+ libmux_dummy_plugin.la \
+ libmux_avi_plugin.la \
+ libmux_mp4_plugin.la \
+ libmux_asf_plugin.la \
+ libmux_wav_plugin.la \
+ libmux_mpjpeg_plugin.la \
+ $(NULL)
diff --git a/modules/mux/mpeg/Modules.am b/modules/mux/mpeg/Modules.am
index b34d214..323c59b 100644
--- a/modules/mux/mpeg/Modules.am
+++ b/modules/mux/mpeg/Modules.am
@@ -10,3 +10,5 @@ SOURCES_mux_ts = ts.c \
csa.h \
bits.h \
$(NULL)
+
+libvlc_LTLIBRARIES += libmux_ps_plugin.la
diff --git a/modules/packetizer/Modules.am b/modules/packetizer/Modules.am
index cf62ed7..7aadef3 100644
--- a/modules/packetizer/Modules.am
+++ b/modules/packetizer/Modules.am
@@ -4,3 +4,13 @@ SOURCES_packetizer_mpeg4video = mpeg4video.c
SOURCES_packetizer_mpeg4audio = mpeg4audio.c
SOURCES_packetizer_h264 = h264.c
SOURCES_packetizer_vc1 = vc1.c
+
+libvlc_LTLIBRARIES += \
+ libpacketizer_mpegvideo_plugin.la \
+ libpacketizer_mpeg4video_plugin.la \
+ libpacketizer_mpeg4audio_plugin.la \
+ libpacketizer_h264_plugin.la \
+ libpacketizer_vc1_plugin.la
+if ENABLE_SOUT
+libvlc_LTLIBRARIES += libpacketizer_copy_plugin.la
+endif
diff --git a/modules/stream_out/Modules.am b/modules/stream_out/Modules.am
index 20f2815..6df2753 100644
--- a/modules/stream_out/Modules.am
+++ b/modules/stream_out/Modules.am
@@ -11,3 +11,18 @@ SOURCES_stream_out_switcher = switcher.c
SOURCES_stream_out_bridge = bridge.c
SOURCES_stream_out_mosaic_bridge = mosaic_bridge.c
SOURCES_stream_out_autodel = autodel.c
+
+libvlc_LTLIBRARIES += \
+ libstream_out_dummy_plugin.la \
+ libstream_out_description_plugin.la \
+ libstream_out_standard_plugin.la \
+ libstream_out_transcode_plugin.la \
+ libstream_out_duplicate_plugin.la \
+ libstream_out_es_plugin.la \
+ libstream_out_display_plugin.la \
+ libstream_out_gather_plugin.la \
+ libstream_out_rtp_plugin.la \
+ libstream_out_bridge_plugin.la \
+ libstream_out_mosaic_bridge_plugin.la \
+ libstream_out_autodel_plugin.la \
+ $(NULL)
More information about the vlc-devel
mailing list