X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2FModules.am;h=7aa0b9967bac97d32c5449eebda97424c6cb35f5;hb=e621ea035d960e8e3b02bdb5af28ac3a12f77d65;hp=43978c6e9ec4294d94be35f3bf47a8283a182098;hpb=4f8fed316b99dd227123521b909c3b457cdbb25c;p=vlc

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 43978c6e9e..7aa0b9967b 100644
--- 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 zip
+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
@@ -26,9 +34,7 @@ SOURCES_access_eyetv = eyetv.m
 SOURCES_dvdnav = dvdnav.c
 SOURCES_dvdread = dvdread.c
 SOURCES_dc1394 = dc1394.c
-SOURCES_access_fake = fake.c
 SOURCES_pvr = pvr.c videodev2.h
-SOURCES_v4l = v4l.c videodev_mjpeg.h
 SOURCES_v4l2 = v4l2.c
 SOURCES_qtcapture = qtcapture.m
 SOURCES_cdda = \
@@ -38,24 +44,53 @@ SOURCES_cdda = \
         vcd/cdrom_internals.h \
         $(NULL)
 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
+
+SOURCES_access_rar = rar/rar.c rar/rar.h rar/access.c
+SOURCES_stream_filter_rar = rar/rar.c rar/rar.h rar/stream.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_imem_plugin.la \
+	libaccess_attachment_plugin.la \
+	libaccess_rar_plugin.la \
+	libstream_filter_rar_plugin.la \
 	$(NULL)
 
+libaccess_alsa_plugin_la_SOURCES = alsa.c
+libaccess_alsa_plugin_la_CFLAGS = $(AM_CFLAGS) $(ALSA_CFLAGS)
+libaccess_alsa_plugin_la_LIBADD = $(AM_LIBADD) $(ALSA_LIBS)
+libaccess_alsa_plugin_la_DEPENDENCIES =
+if HAVE_ALSA
+libvlc_LTLIBRARIES += libaccess_alsa_plugin.la
+endif
+
 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
+EXTRA_LTLIBRARIES += \
+	libaccess_rtmp_plugin.la \
+	libxcb_screen_plugin.la
+libvlc_LTLIBRARIES += $(LTLIBxcb_screen)