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

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Sep  9 12:04:59 2012 +0300| [3bb91f70e7200da741e20fba1d983205aa8f9ea2] | committer: Rémi Denis-Courmont

Remove recursion into modules/access/zip/unzip/

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

 configure.ac                         |    5 ++---
 modules/access/Modules.am            |   16 ++++++++++------
 modules/access/zip/unzip/Makefile.am |   16 ----------------
 3 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/configure.ac b/configure.ac
index 470b567..aa7de91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -745,9 +745,9 @@ then
       have_minizip=yes
       MINIZIP_LIBS="-lminizip -lz"
     ], [
+      VLC_ADD_CPPFLAGS([skins2], [-I\\\$(top_srcdir)/modules/access/zip/unzip])
+      VLC_ADD_LIBS([skins2], [\\\$(top_builddir)/modules/access/libunzip.la])
       have_minizip=no
-      MINIZIP_CFLAGS="-I\\\${top_srcdir}/modules/access/zip/unzip"
-      MINIZIP_LIBS="\\\${top_builddir}/modules/access/zip/unzip/libunzip.la"
     ])
   ])
   VLC_ADD_CPPFLAGS([skins2],[$MINIZIP_CFLAGS])
@@ -4129,7 +4129,6 @@ AC_CONFIG_FILES([
   test/Makefile
   modules/access/Makefile
   modules/access/rtp/Makefile
-  modules/access/zip/unzip/Makefile
   modules/access_output/Makefile
   modules/audio_filter/Makefile
   modules/audio_mixer/Makefile
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index a17b127..a70516d 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -1,5 +1,5 @@
 SUBDIRS = rtp
-DIST_SUBDIRS = $(SUBDIRS)
+noinst_LTLIBRARIES =
 
 libfilesystem_plugin_la_SOURCES = \
 	fs.h \
@@ -24,12 +24,16 @@ 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
+libvlc_LTLIBRARIES += libzip_plugin.la
 if !HAVE_MINIZIP
-SUBDIRS += zip/unzip
-else
-DIST_SUBDIRS += zip/unzip
+libunzip_la_SOURCES = zip/unzip/unzip.c zip/unzip/unzip.h zip/unzip/crypt.h \
+	zip/unzip/ioapi.c zip/unzip/ioapi.h
+libunzip_la_LIBADD = -lz
+libunzip_la_LDFLAGS = -static
+noinst_LTLIBRARIES += libunzip.la
+libzip_plugin_la_CFLAGS += -I$(srcdir)/zip/unzip
+libzip_plugin_la_LIBADD += libunzip.la
 endif
-libvlc_LTLIBRARIES += libzip_plugin.la
 endif
 
 SOURCES_access_directory = directory.c
@@ -225,7 +229,7 @@ libbda_la_SOURCES = dtv/bdadefs.h dtv/bdagraph.cpp dtv/bdagraph.hpp
 libbda_la_CXXFLAGS = $(AM_CXXFLAGS)
 libbda_la_LDFLAGS = -static
 libbda_la_LIBADD = -lstrmiids -lole32 -loleaut32 -luuid
-noinst_LTLIBRARIES = libbda.la
+noinst_LTLIBRARIES += libbda.la
 
 libdtv_plugin_la_DEPENDENCIES = libbda.la
 libdtv_plugin_la_LIBADD += libbda.la -lstdc++
diff --git a/modules/access/zip/unzip/Makefile.am b/modules/access/zip/unzip/Makefile.am
deleted file mode 100644
index 3d7e252..0000000
--- a/modules/access/zip/unzip/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-# Makefile to build the unzip library files
-#
-# By Jean-Philippe André <jpeg at videolan.org>
-# $Id$
-#
-# All other files in this directory (and subdirectories) are copyrighted
-# by their respective owner(s).
-#
-
-noinst_LTLIBRARIES = libunzip.la
-
-noinst_HEADERS = unzip.h crypt.h ioapi.h
-
-libunzip_la_SOURCES = unzip.c ioapi.c
-libunzip_la_LIBADD = -lz
-