Don't use a directory for a lone file

[vlc] / modules / access / Modules.am

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 676fedcab4a20f4915a217630d73b1447b4e4b84..061f2b4542fd7e66af9873dbc7bf2d2caf73ff28 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -3,7 +3,7 @@
 # obviously does not. Here is a fix for that.
 LIBTOOL=@LIBTOOL@ --tag=CC
 
-BASE_SUBDIRS = dvb mms cdda rtp rtsp rtmp vcd vcdx screen bd
+BASE_SUBDIRS = dvb mms rtp rtsp vcd vcdx screen bd zip
 EXTRA_SUBDIRS = bda dshow
 SUBDIRS = $(BASE_SUBDIRS)
 DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
@@ -12,7 +12,15 @@ if HAVE_WIN32
 SUBDIRS += bda dshow
 endif
 
-SOURCES_access_file = file.c
+libfilesystem_plugin_la_SOURCES = \
+       fs.h \
+       file.c \
+       directory.c \
+       fs.c
+libfilesystem_plugin_la_CFLAGS = $(AM_CFLAGS)
+libfilesystem_plugin_la_LIBADD = $(AM_LIBADD)
+libfilesystem_plugin_la_DEPENDENCIES =
+
 SOURCES_access_mmap = mmap.c
 SOURCES_access_directory = directory.c
 SOURCES_access_dv = dv.c
@@ -40,13 +48,39 @@ SOURCES_cdda = \
 SOURCES_access_jack = jack.c
 SOURCES_access_alsa = alsa.c
 SOURCES_access_oss = oss.c
+SOURCES_access_mtp = mtp.c
+SOURCES_access_sftp = sftp.c
+SOURCES_access_imem = imem.c
+SOURCES_access_avio = avio.c avio.h
+SOURCES_access_attachment = attachment.c
+
+libaccess_rtmp_plugin_la_SOURCES = \
+        rtmp/access.c \
+        rtmp/rtmp_amf_flv.c \
+        rtmp/rtmp_amf_flv.h \
+        $(NULL)
+libaccess_rtmp_plugin_la_CFLAGS = $(AM_CFLAGS) \
+       -fno-strict-aliasing
+libaccess_rtmp_plugin_la_LIBADD = $(AM_LIBADD)
+libaccess_rtmp_plugin_la_DEPENDENCIES =
 
 libvlc_LTLIBRARIES += \
-       libaccess_file_plugin.la \
-       libaccess_directory_plugin.la \
+       libfilesystem_plugin.la \
        libaccess_udp_plugin.la \
        libaccess_tcp_plugin.la \
        libaccess_http_plugin.la \
        libaccess_ftp_plugin.la \
        libaccess_fake_plugin.la \
+       libaccess_rtmp_plugin.la \
+       libaccess_imem_plugin.la \
+       libaccess_attachment_plugin.la \
        $(NULL)
+
+libxcb_screen_plugin_la_SOURCES = screen/xcb.c
+libxcb_screen_plugin_la_CFLAGS = $(AM_CFLAGS) \
+       $(XCB_CFLAGS)
+libxcb_screen_plugin_la_LIBADD = $(AM_LIBADD) \
+       $(XCB_LIBS)
+libxcb_screen_plugin_la_DEPENDENCIES =
+EXTRA_LTLIBRARIES += libxcb_screen_plugin.la
+libvlc_LTLIBRARIES += $(LTLIBxcb_screen)