Merge branch 'master' into lpcm_encoder

[vlc] / modules / demux / mpeg / Modules.am

diff --git a/modules/demux/mpeg/Modules.am b/modules/demux/mpeg/Modules.am
index b86b9f122569e65d7821ea7a0d43e326df9c6d7b..48510e90f8467c83a6bb71e53d9f462f496a33cf 100644 (file)
--- a/modules/demux/mpeg/Modules.am
+++ b/modules/demux/mpeg/Modules.am
@@ -1,8 +1,9 @@
-SOURCES_mpeg_system = modules/demux/mpeg/system.c
-SOURCES_es = modules/demux/mpeg/es.c
-SOURCES_ps = modules/demux/mpeg/ps.c
-SOURCES_ts = modules/demux/mpeg/ts.c
-SOURCES_ts_dvbpsi = modules/demux/mpeg/ts.c
-SOURCES_audio = modules/demux/mpeg/audio.c
+SOURCES_es  = es.c
+SOURCES_mpgv = mpgv.c
+SOURCES_h264 = h264.c
 
-noinst_HEADERS += modules/demux/mpeg/system.h
+libvlc_LTLIBRARIES += \
+       libes_plugin.la \
+       libmpgv_plugin.la \
+       libh264_plugin.la \
+       $(NULL)