X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Faccess%2FModules.am;h=db45a5fc1b800cdfb61ea175423b005af238971f;hb=c8492ac6282828be24f526870a299aa28718adfb;hp=fddd9e8ad82ce87c88ed423763ba30c6b74e305c;hpb=f0a61cd7c0a711c1191239a8adf72e3de971b8b9;p=vlc

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index fddd9e8ad8..db45a5fc1b 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 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,12 +44,18 @@ 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_vdr = vdr.c
+SOURCES_libbluray = bluray.c
+SOURCES_decklink = decklink.cpp
+
+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 \
@@ -56,22 +68,33 @@ 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 \
+	libaccess_rar_plugin.la \
+	libstream_filter_rar_plugin.la \
+	libaccess_vdr_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)