xosd: simplification.

[vlc] / modules / demux / Modules.am

diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index 9c6e981d9b68d20d68ac8e968d8c77e08207ce69..97c6d0466bea8ff8845b0631823e4b242a1c1d4d 100644 (file)
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -1,14 +1,11 @@
-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 vorbis.h kate_categories.c kate_categories.h
 SOURCES_demuxdump = demuxdump.c
 SOURCES_rawdv = rawdv.c
 SOURCES_rawvid = rawvid.c
 SOURCES_au = au.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
@@ -34,21 +31,20 @@ SOURCES_demux_cdg = cdg.c
 SOURCES_smf = smf.c
 
 libvlc_LTLIBRARIES += \
-       liba52sys_plugin.la \
        libaiff_plugin.la \
        libau_plugin.la \
        libdemux_cdg_plugin.la \
        libdemuxdump_plugin.la \
-       libdtssys_plugin.la \
        libflacsys_plugin.la \
        libmjpeg_plugin.la \
+       libnsc_plugin.la \
        libnsv_plugin.la \
        libnuv_plugin.la \
        libpva_plugin.la \
+       libps_plugin.la \
        librawdv_plugin.la \
        librawvid_plugin.la \
        libreal_plugin.la \
-       librtp_plugin.la \
        libsmf_plugin.la \
        libsubtitle_plugin.la \
        libtta_plugin.la \
@@ -59,12 +55,3 @@ libvlc_LTLIBRARIES += \
        libwav_plugin.la \
        libxa_plugin.la \
        $(NULL)
-
-# RTP plugin
-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 =
-