[vlc-commits] Move libs/unzip to modules/access/zip/unzip

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Aug 30 19:48:57 2011 +0300| [706d47338580582074b1372d09e7ad161e9e1df2] | committer: Rémi Denis-Courmont

Move libs/unzip to modules/access/zip/unzip

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

 Makefile.am                                    |    7 +------
 configure.ac                                   |   10 ++++------
 modules/access/zip/Modules.am                  |   15 ++++++++++-----
 {libs => modules/access/zip}/unzip/Makefile.am |    0
 {libs => modules/access/zip}/unzip/crypt.h     |    0
 {libs => modules/access/zip}/unzip/ioapi.c     |    0
 {libs => modules/access/zip}/unzip/ioapi.h     |    0
 {libs => modules/access/zip}/unzip/unzip.c     |    0
 {libs => modules/access/zip}/unzip/unzip.h     |    0
 9 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index cff6089..d22eb8c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@
 #  - libs/* are needed by modules
 BASE_SUBDIRS = po compat src bin modules share doc test
 EXTRA_SUBDIRS = m4 \
-	libs/loader libs/srtp libs/unzip
+	libs/loader libs/srtp
 DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 
 SUBDIRS = po compat src
@@ -19,11 +19,6 @@ endif
 if HAVE_GCRYPT
 SUBDIRS += libs/srtp
 endif
-if HAVE_ZLIB
-if !HAVE_MINIZIP
-SUBDIRS += libs/unzip
-endif
-endif
 if BUILD_VLC
 SUBDIRS += bin
 endif
diff --git a/configure.ac b/configure.ac
index 9812a53..fad2e09 100644
--- a/configure.ac
+++ b/configure.ac
@@ -822,14 +822,12 @@ then
       MINIZIP_LIBS="-lminizip -lz"
     ], [
       have_minizip=no
-      MINIZIP_CFLAGS="-I\\\${top_srcdir}/libs/unzip"
-      MINIZIP_LIBS="\\\${top_builddir}/libs/unzip/libunzip.la"
+      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])
-  VLC_ADD_CFLAGS([zip],[$MINIZIP_CFLAGS])
-  VLC_ADD_LIBS([skins2 zip],[$MINIZIP_LIBS])
-  VLC_ADD_PLUGIN([unzip zip])
+  VLC_ADD_LIBS([skins2],[$MINIZIP_LIBS])
 fi
 AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
 
@@ -4263,7 +4261,6 @@ AC_CONFIG_FILES([
   doc/Makefile
   libs/loader/Makefile
   libs/srtp/Makefile
-  libs/unzip/Makefile
   modules/Makefile
   m4/Makefile
   po/Makefile.in
@@ -4283,6 +4280,7 @@ AC_CONFIG_FILES([
   modules/access/vcdx/Makefile
   modules/access/screen/Makefile
   modules/access/zip/Makefile
+  modules/access/zip/unzip/Makefile
   modules/access_output/Makefile
   modules/audio_filter/Makefile
   modules/audio_mixer/Makefile
diff --git a/modules/access/zip/Modules.am b/modules/access/zip/Modules.am
index b8b1f9a..ee008ef 100644
--- a/modules/access/zip/Modules.am
+++ b/modules/access/zip/Modules.am
@@ -1,7 +1,12 @@
+if !HAVE_MINIZIP
+SUBDIRS = unzip
+endif
+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
-SOURCES_zip = \
-	zip.h \
-	zipstream.c \
-	zipaccess.c \
-	$(NULL)
+libvlc_LTLIBRARIES += libzip_plugin.la
 endif
diff --git a/libs/unzip/Makefile.am b/modules/access/zip/unzip/Makefile.am
similarity index 100%
rename from libs/unzip/Makefile.am
rename to modules/access/zip/unzip/Makefile.am
diff --git a/libs/unzip/crypt.h b/modules/access/zip/unzip/crypt.h
similarity index 100%
rename from libs/unzip/crypt.h
rename to modules/access/zip/unzip/crypt.h
diff --git a/libs/unzip/ioapi.c b/modules/access/zip/unzip/ioapi.c
similarity index 100%
rename from libs/unzip/ioapi.c
rename to modules/access/zip/unzip/ioapi.c
diff --git a/libs/unzip/ioapi.h b/modules/access/zip/unzip/ioapi.h
similarity index 100%
rename from libs/unzip/ioapi.h
rename to modules/access/zip/unzip/ioapi.h
diff --git a/libs/unzip/unzip.c b/modules/access/zip/unzip/unzip.c
similarity index 100%
rename from libs/unzip/unzip.c
rename to modules/access/zip/unzip/unzip.c
diff --git a/libs/unzip/unzip.h b/modules/access/zip/unzip/unzip.h
similarity index 100%
rename from libs/unzip/unzip.h
rename to modules/access/zip/unzip/unzip.h