Slightly clearer code.

[vlc] / modules / stream_out / Modules.am

diff --git a/modules/stream_out/Modules.am b/modules/stream_out/Modules.am
index 36625b359736997b8934fd2dab6edb2db4f32153..1bfafeb1f12d105cce7ed1c4b8b7646822fafd2d 100644 (file)
--- a/modules/stream_out/Modules.am
+++ b/modules/stream_out/Modules.am
@@ -1,7 +1,8 @@
+SUBDIRS = transcode
+
 SOURCES_stream_out_dummy = dummy.c
 SOURCES_stream_out_description = description.c
 SOURCES_stream_out_standard = standard.c
-SOURCES_stream_out_transcode = transcode.c
 SOURCES_stream_out_duplicate = duplicate.c
 SOURCES_stream_out_es = es.c
 SOURCES_stream_out_display = display.c
@@ -18,7 +19,6 @@ 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 \
@@ -30,15 +30,18 @@ libvlc_LTLIBRARIES += \
        libstream_out_smem_plugin.la \
        $(NULL)
 
-if HAVE_LIBGCRYPT
 # RTP plugin
 libvlc_LTLIBRARIES += \
        libstream_out_rtp_plugin.la
 libstream_out_rtp_plugin_la_SOURCES = \
        rtp.c rtp.h rtpfmt.c rtcp.c rtsp.c
-libstream_out_rtp_plugin_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/libs/srtp
-libstream_out_rtp_plugin_la_LIBADD = $(AM_LIBADD) \
-       $(top_builddir)/libs/srtp/libvlc_srtp.la
-libstream_out_rtp_plugin_la_DEPENDENCIES = \
-       $(top_builddir)/libs/srtp/libvlc_srtp.la
+libstream_out_rtp_plugin_la_CFLAGS = $(AM_CFLAGS)
+libstream_out_rtp_plugin_la_LIBADD = $(AM_LIBADD)
+libstream_out_rtp_plugin_la_DEPENDENCIES =
+if HAVE_GCRYPT
+SRTP_CFLAGS = -I$(top_srcdir)/libs/srtp
+SRTP_LIBS = $(top_builddir)/libs/srtp/libvlc_srtp.la
+libstream_out_rtp_plugin_la_CFLAGS += -DHAVE_SRTP $(SRTP_CFLAGS)
+libstream_out_rtp_plugin_la_LIBADD += $(SRTP_LIBS)
+libstream_out_rtp_plugin_la_DEPENDENCIES += $(SRTP_LIBS)
 endif