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 f992ae3b278be25f2321bc94d87ce1d12a7a7b5a..1762541bd642b75248c7ca2c68fc721cd575f9ee 100644 (file)
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -1,45 +1,46 @@
-SUBDIRS = asf avformat avi mp4 mpeg playlist
-SOURCES_a52sys = a52.c
-SOURCES_dtssys = dts.c
+SUBDIRS = asf avformat avi mkv mp4 mpeg playlist
 SOURCES_flacsys = flac.c
-SOURCES_ogg = ogg.c
+SOURCES_ogg = ogg.c ogg.h oggseek.c oggseek.h vorbis.h kate_categories.c \
+       kate_categories.h xiph.h
 SOURCES_demuxdump = demuxdump.c
 SOURCES_rawdv = rawdv.c
 SOURCES_rawvid = rawvid.c
 SOURCES_au = au.c
+SOURCES_rawaud = rawaud.c
 SOURCES_wav = wav.c
-SOURCES_mkv = mkv.cpp mp4/libmp4.c mp4/drms.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
 SOURCES_pva = pva.c
 SOURCES_aiff = aiff.c
-SOURCES_mjpeg = mjpeg.c
+SOURCES_mjpeg = mjpeg.c mxpeg_helper.h
 SOURCES_subtitle = subtitle.c
-SOURCES_asademux = subtitle_asa.c asademux.c asademux_defs.h asademux.h
 SOURCES_ty = ty.c ../codec/cc.h
-SOURCES_vobsub = vobsub.c
+SOURCES_vobsub = vobsub.c vobsub.h
 SOURCES_voc = voc.c
 SOURCES_xa = xa.c
 SOURCES_nuv = nuv.c
 SOURCES_nsc = nsc.c
 SOURCES_mpc = mpc.c
-SOURCES_gme = gme.cpp
 SOURCES_tta = tta.c
 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 mxpeg_helper.h
+SOURCES_demux_stl = stl.c
 
 libvlc_LTLIBRARIES += \
-       liba52sys_plugin.la \
        libaiff_plugin.la \
        libau_plugin.la \
+       librawaud_plugin.la \
+       libdirac_plugin.la \
        libdemux_cdg_plugin.la \
        libdemuxdump_plugin.la \
-       libdtssys_plugin.la \
        libflacsys_plugin.la \
        libmjpeg_plugin.la \
        libnsc_plugin.la \
@@ -59,17 +60,19 @@ libvlc_LTLIBRARIES += \
        libvoc_plugin.la \
        libwav_plugin.la \
        libxa_plugin.la \
+       libimage_plugin.la \
+       libdemux_stl_plugin.la \
        $(NULL)
 
-if HAVE_LIBGCRYPT
-# RTP plugin
-libvlc_LTLIBRARIES += \
-       librtp_plugin.la
-librtp_plugin_la_SOURCES = \
-       rtp.c rtp.h rtpsession.c
-librtp_plugin_la_CFLAGS = $(AM_CFLAGS) -I$(top_srcdir)/libs/srtp
-librtp_plugin_la_LIBADD = $(AM_LIBADD) \
-       $(top_builddir)/libs/srtp/libvlc_srtp.la
-librtp_plugin_la_DEPENDENCIES = \
-       $(top_builddir)/libs/srtp/libvlc_srtp.la
+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:
+       touch dummy.cpp