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

diff --git a/Makefile.am b/Makefile.am
index cff608998179f7f587280ad84811f03920d0acc1..d22eb8c57b12485d2dfe9da89314d50127e0a8b1 100644 (file)
--- 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 9812a531bace81f4e5cd8c101e09734c596e5912..fad2e097c0ebf2d3b2436f3d0e33ed96fc039f79 100644 (file)
--- 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 b8b1f9ac0f89851943c17838a9a527f719ad7713..ee008efb661ce261b0c97e6c894b826b7e767c04 100644 (file)
--- 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