X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2FModules.am;h=f37cf314462d4dc938f375b45e4880f1309fd2d0;hb=c60652e38ac6afd74bd8225e9dae5406f13aaa4f;hp=3e19434965a83c68524be41a66b03c3280454fd0;hpb=74e39ff5c2338562f55aba264ac70ed7f1b43e85;p=vlc

diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index 3e19434965..f37cf31446 100644
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -1,27 +1,25 @@
-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_mod = mod.c dummy.cpp
 SOURCES_pva = pva.c
 SOURCES_aiff = aiff.c
 SOURCES_mjpeg = mjpeg.c
 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
@@ -32,23 +30,26 @@ SOURCES_tta = tta.c
 SOURCES_vc1 = vc1.c
 SOURCES_demux_cdg = cdg.c
 SOURCES_smf = smf.c
+SOURCES_dirac = dirac.c
+SOURCES_image = image.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 \
 	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 \
@@ -58,13 +59,10 @@ libvlc_LTLIBRARIES += \
 	libvoc_plugin.la \
 	libwav_plugin.la \
 	libxa_plugin.la \
+	libimage_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 = \
-	$(top_builddir)/libs/srtp/libvlc_srtp.la
+BUILT_SOURCES += dummy.cpp
+
+dummy.cpp:
+	touch dummy.cpp