Remove recursion into modules/demux/avi/

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

modules/demux/Modules.am

-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 \

modules/demux/avi/Modules.am

-SOURCES_avi = \
-	avi.c \
-	libavi.c \
-	libavi.h \
-	$(NULL)
-
-libvlc_LTLIBRARIES += libavi_plugin.la