ASF: better logging and more consistent with MKV/MP4 demux

[vlc] / modules / demux / Modules.am

diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index e4950e40fd6bcd5ceb8fbb12e4295fc7b784bb8f..1762541bd642b75248c7ca2c68fc721cd575f9ee 100644 (file)
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -11,12 +11,11 @@ SOURCES_wav = wav.c
 SOURCES_live555 = live555.cpp ../access/mms/asf.c ../access/mms/buffer.c
 SOURCES_nsv = nsv.c
 SOURCES_real = real.c
-SOURCES_ts = ts.c ../mux/mpeg/csa.c
 SOURCES_ps = ps.c ps.h
-SOURCES_mod = mod.c dummy.cpp
+SOURCES_mod = mod.c
 SOURCES_pva = pva.c
 SOURCES_aiff = aiff.c
-SOURCES_mjpeg = mjpeg.c
+SOURCES_mjpeg = mjpeg.c mxpeg_helper.h
 SOURCES_subtitle = subtitle.c
 SOURCES_ty = ty.c ../codec/cc.h
 SOURCES_vobsub = vobsub.c vobsub.h
@@ -30,8 +29,10 @@ SOURCES_vc1 = vc1.c
 SOURCES_demux_cdg = cdg.c
 SOURCES_smf = smf.c
 SOURCES_gme = gme.c dummy.cpp
+SOURCES_sid = sid.cpp
 SOURCES_dirac = dirac.c
-SOURCES_image = image.c
+SOURCES_image = image.c mxpeg_helper.h
+SOURCES_demux_stl = stl.c
 
 libvlc_LTLIBRARIES += \
        libaiff_plugin.la \
@@ -60,8 +61,17 @@ libvlc_LTLIBRARIES += \
        libwav_plugin.la \
        libxa_plugin.la \
        libimage_plugin.la \
+       libdemux_stl_plugin.la \
        $(NULL)
 
+libts_plugin_la_SOURCES = ts.c ../mux/mpeg/csa.c dvb-text.h
+libts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS)
+libts_plugin_la_LIBADD = $(AM_LIBADD) $(DVBPSI_LIBS) $(SOCKET_LIBS)
+libts_plugin_la_DEPENDENCIES =
+if HAVE_DVBPSI
+libvlc_LTLIBRARIES += libts_plugin.la
+endif
+
 BUILT_SOURCES += dummy.cpp
 
 dummy.cpp: