mux: ts: split ts encapsulation

[vlc] / modules / mux / Modules.am

diff --git a/modules/mux/Modules.am b/modules/mux/Modules.am
index b644bfff11cff5c683e84a78f9b9177112e56e0f..e5b6da44a15081f47d76a84181cdfe73611217a4 100644 (file)
--- a/modules/mux/Modules.am
+++ b/modules/mux/Modules.am
@@ -1,13 +1,12 @@
-SUBDIRS = mpeg
 SOURCES_mux_dummy = dummy.c
 SOURCES_mux_avi = avi.c
 SOURCES_mux_ogg = ogg.c
-SOURCES_mux_mp4 = mp4.c
-SOURCES_mux_asf = asf.c
+SOURCES_mux_mp4 = mp4.c ../demux/mpeg/mpeg_parser_helpers.h ../demux/mp4/libmp4.h
+SOURCES_mux_asf = asf.c ../demux/asf/libasf_guid.h
 SOURCES_mux_wav = wav.c
 SOURCES_mux_mpjpeg = mpjpeg.c
 
-libvlc_LTLIBRARIES += \
+mux_LTLIBRARIES += \
        libmux_dummy_plugin.la \
        libmux_avi_plugin.la \
        libmux_mp4_plugin.la \
@@ -16,13 +15,19 @@ libvlc_LTLIBRARIES += \
        libmux_mpjpeg_plugin.la \
        $(NULL)
 
+libmux_ps_plugin_la_SOURCES = \
+       mpeg/pes.c mpeg/pes.h \
+       mpeg/ps.c mpeg/bits.h
+libmux_ps_plugin_la_CFLAGS = $(AM_CLFAGS)
+mux_LTLIBRARIES += libmux_ps_plugin.la
+
 libmux_ts_plugin_la_SOURCES = \
        mpeg/pes.c mpeg/pes.h \
        mpeg/csa.c mpeg/csa.h \
-       mpeg/ts.c mpeg/bits.h
+       mpeg/tsutil.c mpeg/tsutil.h \
+       mpeg/ts.c mpeg/bits.h mpeg/dvbpsi_compat.h
 libmux_ts_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVBPSI_CFLAGS)
-libmux_ts_plugin_la_LIBADD = $(AM_LIBADD) $(DVBPSI_LIBS)
-libmux_ts_plugin_la_DEPENDENCIES =
+libmux_ts_plugin_la_LIBADD = $(DVBPSI_LIBS)
 if HAVE_DVBPSI
-libvlc_LTLIBRARIES += libmux_ts_plugin.la
+mux_LTLIBRARIES += libmux_ts_plugin.la
 endif