vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Sep 9 14:35:38 2012 +0300| [c5517b22c8b4d9cdc05e6b6692966b0fc3387178] | committer: Rémi Denis-Courmont
Remove recursion into modules/misc/playlist/ > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c5517b22c8b4d9cdc05e6b6692966b0fc3387178 --- configure.ac | 1 - modules/misc/Modules.am | 14 ++++++++++---- modules/misc/playlist/Modules.am | 8 -------- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/configure.ac b/configure.ac index 5f72eba..cfc09a6 100644 --- a/configure.ac +++ b/configure.ac @@ -4091,7 +4091,6 @@ AC_CONFIG_FILES([ modules/lua/Makefile modules/meta_engine/Makefile modules/misc/Makefile - modules/misc/playlist/Makefile modules/misc/osd/Makefile modules/misc/stats/Makefile modules/media_library/Makefile diff --git a/modules/misc/Modules.am b/modules/misc/Modules.am index 63139d2..6c1d336 100644 --- a/modules/misc/Modules.am +++ b/modules/misc/Modules.am @@ -1,13 +1,19 @@ -BASE_SUBDIRS = playlist stats osd - -SUBDIRS = $(BASE_SUBDIRS) -DIST_SUBDIRS = $(BASE_SUBDIRS) +SUBDIRS = stats osd SOURCES_vod_rtsp = rtsp.c SOURCES_audioscrobbler = audioscrobbler.c SOURCES_sqlite = sqlite.c SOURCES_xml = xml/libxml.c +libexport_plugin_la_SOURCES = \ + playlist/html.c \ + playlist/m3u.c \ + playlist/xspf.c \ + playlist/export.c +libexport_plugin_la_CFLAGS = $(AM_CFLAGS) +libexport_plugin_la_LIBADD = $(AM_LIBADD) +libvlc_LTLIBRARIES += libexport_plugin.la + libgnutls_plugin_la_SOURCES = gnutls.c dhparams.h libgnutls_plugin_la_CFLAGS = $(AM_CFLAGS) $(GNUTLS_CFLAGS) $(GCRYPT_CFLAGS) libgnutls_plugin_la_LIBADD = $(AM_LIBADD) $(GNUTLS_LIBS) $(GCRYPT_LIBS) diff --git a/modules/misc/playlist/Modules.am b/modules/misc/playlist/Modules.am deleted file mode 100644 index fbeec8c..0000000 --- a/modules/misc/playlist/Modules.am +++ /dev/null @@ -1,8 +0,0 @@ -SOURCES_export = \ - export.c \ - html.c \ - m3u.c \ - xspf.c \ - $(NULL) - -libvlc_LTLIBRARIES += libexport_plugin.la _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
