vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 9 14:59:00 2012 +0300| [049c66f78d099e8d8eaa775ff01ba10ecb617cc9] | committer: Rémi Denis-Courmont
Remove recursion into modules/demux/avi/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=049c66f78d099e8d8eaa775ff01ba10ecb617cc9 --- configure.ac | 1 - modules/demux/Modules.am | 7 ++++++- modules/demux/avi/Modules.am | 7 ------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 1eccce3..72895aa 100644 --- a/configure.ac +++ b/configure.ac @@ -4076,7 +4076,6 @@ AC_CONFIG_FILES([ modules/control/Makefile modules/demux/Makefile modules/demux/avformat/Makefile - modules/demux/avi/Makefile modules/demux/mkv/Makefile modules/demux/mp4/Makefile modules/demux/mpeg/Makefile diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am index db60247..ac69c3d 100644 --- a/modules/demux/Modules.am +++ b/modules/demux/Modules.am @@ -1,4 +1,4 @@ -SUBDIRS = avformat avi mkv mp4 mpeg playlist +SUBDIRS = avformat mkv mp4 mpeg playlist SOURCES_flacsys = flac.c SOURCES_ogg = ogg.c ogg.h oggseek.c oggseek.h vorbis.h kate_categories.c \ kate_categories.h xiph.h @@ -38,6 +38,10 @@ libasf_plugin_la_SOURCES = asf/asf.c asf/libasf.c asf/libasf.h asf/libasf_guid.h libasf_plugin_la_CFLAGS = $(AM_CFLAGS) libasf_plugin_la_LIBADD = $(AM_LIBADD) +libavi_plugin_la_SOURCES = avi/avi.c avi/libavi.c avi/libavi.h +libavi_plugin_la_CFLAGS = $(AM_CFLAGS) +libavi_plugin_la_LIBADD = $(AM_LIBADD) + 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) @@ -49,6 +53,7 @@ libvlc_LTLIBRARIES += \ libaiff_plugin.la \ libasf_plugin.la \ libau_plugin.la \ + libavi_plugin.la \ librawaud_plugin.la \ libdirac_plugin.la \ libdemux_cdg_plugin.la \ diff --git a/modules/demux/avi/Modules.am b/modules/demux/avi/Modules.am deleted file mode 100644 index f0618da..0000000 --- a/modules/demux/avi/Modules.am +++ /dev/null @@ -1,7 +0,0 @@ -SOURCES_avi = \ - avi.c \ - libavi.c \ - libavi.h \ - $(NULL) - -libvlc_LTLIBRARIES += libavi_plugin.la _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
