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

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 15:19:53 2012 +0300| [1f9312aa6b2adb95557a4b3c1240d89802f5e2ab] | committer: Rémi Denis-Courmont

Remove recursion into modules/demux/mkv/

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

 configure.ac                 |    5 ++---
 modules/demux/Modules.am     |   26 +++++++++++++++++++++++++-
 modules/demux/mkv/Modules.am |   12 ------------
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 603d635..eb36a68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,7 +155,7 @@ case "${host_os}" in
     CPPFLAGS="${CPPFLAGS} ${ARCH_flag}"
     OBJCFLAGS="${OBJCFLAGS} -D_INTL_REDIRECT_MACROS -std=gnu99 ${ARCH_flag}"
     LDFLAGS="${LDFLAGS} -Wl,-headerpad_max_install_names ${ARCH_flag}"
-    VLC_ADD_LIBS([mkv motion], [-Wl,-framework,IOKit,-framework,CoreFoundation])
+    VLC_ADD_LIBS([motion], [-Wl,-framework,IOKit,-framework,CoreFoundation])
     VLC_ADD_LIBS([libvlc vlc],[-Wl,-undefined,dynamic_lookup,-framework,Appkit])
     VLC_ADD_LIBS([avcodec avformat access_avio swscale postproc i420_rgb_mmx x264 x26410b],[-Wl,-read_only_relocs,suppress])
     VLC_ADD_CFLAGS([motion],[-fconstant-cfstrings])
@@ -739,7 +739,7 @@ AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ])
 AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ])
 if test "${have_zlib}" = "yes"
 then
-  VLC_ADD_LIBS([access_http skins2 sap mkv unzip zip],[-lz])
+  VLC_ADD_LIBS([access_http skins2 sap unzip zip],[-lz])
   PKG_CHECK_MODULES([MINIZIP], [minizip] , [ have_minizip=yes ], [
     AC_CHECK_HEADERS([unzip.h], [
       have_minizip=yes
@@ -4076,7 +4076,6 @@ AC_CONFIG_FILES([
   modules/control/Makefile
   modules/demux/Makefile
   modules/demux/avformat/Makefile
-  modules/demux/mkv/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 7664c1a..69caa3e 100644
--- a/modules/demux/Modules.am
+++ b/modules/demux/Modules.am
@@ -1,4 +1,4 @@
-SUBDIRS = avformat mkv
+SUBDIRS = avformat
 SOURCES_flacsys = flac.c
 SOURCES_ogg = ogg.c ogg.h oggseek.c oggseek.h vorbis.h kate_categories.c \
 	kate_categories.h xiph.h
@@ -50,6 +50,30 @@ libh264_plugin_la_SOURCES = mpeg/h264.c
 libh264_plugin_la_CFLAGS = $(AM_CFLAGS)
 libh264_plugin_la_LIBADD = $(AM_LIBADD)
 
+libmkv_plugin_la_SOURCES = \
+	mkv/util.hpp mkv/util.cpp \
+	mkv/virtual_segment.hpp mkv/virtual_segment.cpp \
+	mkv/matroska_segment.hpp mkv/matroska_segment.cpp \
+	mkv/matroska_segment_parse.cpp \
+	mkv/demux.hpp mkv/demux.cpp \
+	mkv/Ebml_parser.hpp mkv/Ebml_parser.cpp \
+	mkv/chapters.hpp mkv/chapters.cpp \
+	mkv/chapter_command.hpp mkv/chapter_command.cpp \
+	mkv/stream_io_callback.hpp mkv/stream_io_callback.cpp \
+	mp4/libmp4.c vobsub.h \
+	mkv/mkv.hpp mkv/mkv.cpp
+libmkv_plugin_la_CPPFLAGS = $(AM_CPPFLAGS)
+libmkv_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_mkv)
+libmkv_plugin_la_LDFLAGS = $(AM_LDFLAGS)
+if HAVE_ZLIB
+libmkv_plugin_la_LIBADD += -lz
+endif
+if HAVE_DARWIN
+libmkv_plugin_la_LDFLAGS += -Wl,-framework,IOKit,-framework,CoreFoundation
+endif
+libvlc_LTLIBRARIES += $(LTLIBmkv)
+EXTRA_LTLIBRARIES += libmkv_plugin.la
+
 libmp4_plugin_la_SOURCES = mp4/mp4.c mp4/libmp4.c mp4/libmp4.h mp4/id3genres.h
 libmp4_plugin_la_CFLAGS = $(AM_CFLAGS)
 libmp4_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
diff --git a/modules/demux/mkv/Modules.am b/modules/demux/mkv/Modules.am
deleted file mode 100644
index e20283f..0000000
--- a/modules/demux/mkv/Modules.am
+++ /dev/null
@@ -1,12 +0,0 @@
-SOURCES_mkv = mkv.hpp mkv.cpp \
-              util.hpp util.cpp \
-              virtual_segment.hpp virtual_segment.cpp \
-              matroska_segment.hpp matroska_segment.cpp matroska_segment_parse.cpp \
-              demux.hpp demux.cpp \
-              Ebml_parser.hpp Ebml_parser.cpp \
-              chapters.hpp chapters.cpp \
-              chapter_command.hpp chapter_command.cpp \
-              stream_io_callback.hpp stream_io_callback.cpp \
-              ../mp4/libmp4.c \
-              ../vobsub.h
-