[vlc-commits] Remove recursion into modules/demux/asf/

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 14:57:33 2012 +0300| [6982d99b4a96fac034369896bfba5560333cf621] | committer: Rémi Denis-Courmont

Remove recursion into modules/demux/asf/

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6982d99b4a96fac034369896bfba5560333cf621
---

 configure.ac                 |    1 -
 modules/demux/Modules.am     |   21 +++++++++++++--------
 modules/demux/asf/Modules.am |    8 --------
 3 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/configure.ac b/configure.ac
index 39bedc0..1eccce3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4075,7 +4075,6 @@ AC_CONFIG_FILES([
   modules/codec/wmafixed/Makefile
   modules/control/Makefile
   modules/demux/Makefile
-  modules/demux/asf/Makefile
   modules/demux/avformat/Makefile
   modules/demux/avi/Makefile
   modules/demux/mkv/Makefile
diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index 3c0ec72..db60247 100644
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -1,4 +1,4 @@
-SUBDIRS = asf avformat avi mkv mp4 mpeg playlist
+SUBDIRS = avformat avi 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
@@ -34,8 +34,20 @@ SOURCES_dirac = dirac.c
 SOURCES_image = image.c mxpeg_helper.h
 SOURCES_demux_stl = stl.c
 
+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)
+
+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)
+if HAVE_DVBPSI
+libvlc_LTLIBRARIES += libts_plugin.la
+endif
+
 libvlc_LTLIBRARIES += \
 	libaiff_plugin.la \
+	libasf_plugin.la \
 	libau_plugin.la \
 	librawaud_plugin.la \
 	libdirac_plugin.la \
@@ -64,13 +76,6 @@ libvlc_LTLIBRARIES += \
 	libdemux_stl_plugin.la \
 	$(NULL)
 
-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)
-if HAVE_DVBPSI
-libvlc_LTLIBRARIES += libts_plugin.la
-endif
-
 BUILT_SOURCES += dummy.cpp
 
 dummy.cpp:
diff --git a/modules/demux/asf/Modules.am b/modules/demux/asf/Modules.am
deleted file mode 100644
index 7079ec8..0000000
--- a/modules/demux/asf/Modules.am
+++ /dev/null
@@ -1,8 +0,0 @@
-SOURCES_asf = \
-	asf.c \
-	libasf.c \
-	libasf.h \
-	libasf_guid.h \
-	$(NULL)
-
-libvlc_LTLIBRARIES += libasf_plugin.la