[vlc-commits] Remove recursion into modules/access/zip/

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 11:52:40 2012 +0300| [e4179b139164c2927683d0e87c1d33c0cd3994d5] | committer: Rémi Denis-Courmont

Remove recursion into modules/access/zip/

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

 configure.ac                  |    1 -
 modules/access/Modules.am     |   15 ++++++++++++++-
 modules/access/zip/Modules.am |   12 ------------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index c2f437f..3463e95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4130,7 +4130,6 @@ AC_CONFIG_FILES([
   modules/access/Makefile
   modules/access/mms/Makefile
   modules/access/rtp/Makefile
-  modules/access/zip/Makefile
   modules/access/zip/unzip/Makefile
   modules/access_output/Makefile
   modules/audio_filter/Makefile
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 7971318..b112ced 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -1,4 +1,5 @@
-SUBDIRS = mms rtp zip
+SUBDIRS = mms rtp
+DIST_SUBDIRS = $(SUBDIRS)
 
 libfilesystem_plugin_la_SOURCES = \
 	fs.h \
@@ -19,6 +20,18 @@ libsdp_plugin_la_SOURCES = sdp.c
 libsdp_plugin_la_CFLAGS = $(AM_CFLAGS)
 libsdp_plugin_la_LIBADD = $(AM_LIBADD)
 
+libzip_plugin_la_SOURCES = zip/zip.h zip/zipstream.c zip/zipaccess.c
+libzip_plugin_la_CFLAGS = $(AM_CFLAGS) $(MINIZIP_CFLAGS)
+libzip_plugin_la_LIBADD = $(AM_LIBADD) $(MINIZIP_LIBS)
+if HAVE_ZLIB
+if !HAVE_MINIZIP
+SUBDIRS += zip/unzip
+else
+DIST_SUBDIRS += zip/unzip
+endif
+libvlc_LTLIBRARIES += libzip_plugin.la
+endif
+
 SOURCES_access_directory = directory.c
 SOURCES_access_gnomevfs = gnomevfs.c
 SOURCES_access_eyetv = eyetv.m
diff --git a/modules/access/zip/Modules.am b/modules/access/zip/Modules.am
deleted file mode 100644
index 1b1f167..0000000
--- a/modules/access/zip/Modules.am
+++ /dev/null
@@ -1,12 +0,0 @@
-DIST_SUBDIRS = unzip
-
-libzip_plugin_la_SOURCES = zip.h zipstream.c zipaccess.c
-libzip_plugin_la_CFLAGS = $(AM_CFLAGS) $(MINIZIP_CFLAGS)
-libzip_plugin_la_LIBADD = $(AM_LIBADD) $(MINIZIP_LIBS)
-
-if HAVE_ZLIB
-if !HAVE_MINIZIP
-SUBDIRS = unzip
-endif
-libvlc_LTLIBRARIES += libzip_plugin.la
-endif