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

Remove recursion into modules/access/zip/

parent 4cefbe9a
......@@ -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
......
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
......
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
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