Commit 3bb91f70 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove recursion into modules/access/zip/unzip/

parent b6c921db
......@@ -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
......
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++
......
# Makefile to build the unzip library files
#
# By Jean-Philippe André <jpeg@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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment