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

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 15:10:00 2012 +0300| [7495b8698a4fae87a8d71d630dfb05a7110490fa] | committer: Rémi Denis-Courmont

Remove recursion into modules/demux/playlist/

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

 configure.ac                      |    1 -
 modules/demux/Modules.am          |   25 ++++++++++++++++++++++++-
 modules/demux/playlist/Modules.am |   23 -----------------------
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/configure.ac b/configure.ac
index d012568..603d635 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4077,7 +4077,6 @@ AC_CONFIG_FILES([
   modules/demux/Makefile
   modules/demux/avformat/Makefile
   modules/demux/mkv/Makefile
-  modules/demux/playlist/Makefile
   modules/gui/Makefile
   modules/gui/macosx/Makefile
   modules/gui/minimal_macosx/Makefile
diff --git a/modules/demux/Modules.am b/modules/demux/Modules.am
index 4db0676..7664c1a 100644
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -1,4 +1,4 @@
-SUBDIRS = avformat mkv playlist
+SUBDIRS = avformat mkv
 SOURCES_flacsys = flac.c
 SOURCES_ogg = ogg.c ogg.h oggseek.c oggseek.h vorbis.h kate_categories.c \
 	kate_categories.h xiph.h
@@ -65,6 +65,28 @@ libmpgv_plugin_la_SOURCES = mpeg/mpgv.c
 libmpgv_plugin_la_CFLAGS = $(AM_CFLAGS)
 libmpgv_plugin_la_LIBADD = $(AM_LIBADD)
 
+libplaylist_plugin_la_SOURCES = \
+	playlist/asx.c \
+	playlist/b4s.c \
+	playlist/dvb.c \
+	playlist/gvp.c \
+	playlist/ifo.c \
+	playlist/itml.c \
+	playlist/itml.h \
+	playlist/m3u.c \
+	playlist/pls.c \
+	playlist/podcast.c \
+	playlist/qtl.c \
+	playlist/ram.c \
+	playlist/sgimb.c \
+	playlist/shoutcast.c \
+	playlist/wpl.c \
+	playlist/xspf.c \
+	playlist/zpl.c \
+	playlist/playlist.c playlist/playlist.h
+libplaylist_plugin_la_CFLAGS = $(AM_CFLAGS)
+libplaylist_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)
@@ -90,6 +112,7 @@ libvlc_LTLIBRARIES += \
 	libnsc_plugin.la \
 	libnsv_plugin.la \
 	libnuv_plugin.la \
+	libplaylist_plugin.la \
 	libpva_plugin.la \
 	libps_plugin.la \
 	librawdv_plugin.la \
diff --git a/modules/demux/playlist/Modules.am b/modules/demux/playlist/Modules.am
deleted file mode 100644
index cf2ea35..0000000
--- a/modules/demux/playlist/Modules.am
+++ /dev/null
@@ -1,23 +0,0 @@
-SOURCES_playlist = \
-	asx.c \
-	b4s.c \
-	dvb.c \
-	gvp.c \
-	ifo.c \
-	itml.c \
-	itml.h \
-	m3u.c \
-	playlist.c \
-	playlist.h \
-	pls.c \
-	podcast.c \
-	qtl.c \
-	ram.c \
-	sgimb.c \
-	shoutcast.c \
-	wpl.c \
-	xspf.c \
-	zpl.c \
-	$(NULL)
-
-libvlc_LTLIBRARIES += libplaylist_plugin.la