X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2FModules.am;h=1e97e4e4ab6b67f369bf81481f9d0cdf46e09fb3;hb=2971d9bd2279b4069dea237ab6f0394cb40e2de7;hp=be8c47b8fee03e5f4fc42c61b8e13f2d6ad587df;hpb=718b1f9901e5077b50c2189604afba883ca87bf7;p=vlc

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index be8c47b8fe..1e97e4e4ab 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 = mms rtp rtsp vcd vcdx screen bd zip
+BASE_SUBDIRS = bd mms rtp rtsp screen vcd vcdx zip
 EXTRA_SUBDIRS = dshow
 SUBDIRS = $(BASE_SUBDIRS)
 DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
@@ -44,7 +44,6 @@ libaccess_smb_plugin_la_DEPENDENCIES =
 libvlc_LTLIBRARIES += $(LTLIBaccess_smb)
 
 SOURCES_access_directory = directory.c
-SOURCES_access_dv = dv.c
 SOURCES_access_udp = udp.c
 SOURCES_access_tcp = tcp.c
 SOURCES_access_http = http.c
@@ -54,6 +53,7 @@ SOURCES_access_eyetv = eyetv.m
 SOURCES_dvdnav = dvdnav.c
 SOURCES_dvdread = dvdread.c
 SOURCES_dc1394 = dc1394.c
+SOURCES_dv1394 = dv.c
 SOURCES_pvr = pvr.c
 SOURCES_linsys_sdi = linsys/linsys_sdi.c linsys/linsys_sdi.h
 SOURCES_linsys_hdsdi = \
@@ -99,16 +99,6 @@ libvlc_LTLIBRARIES += \
         $(NULL)
 endif
 
-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 += \
 	libfilesystem_plugin.la \
 	libidummy_plugin.la \
@@ -158,13 +148,16 @@ libaccess_shm_plugin_la_DEPENDENCIES =
 libvlc_LTLIBRARIES += $(LTLIBaccess_shm)
 
 libv4l2_plugin_la_SOURCES = \
+	v4l2/v4l2.c \
 	v4l2/video.c \
 	v4l2/demux.c \
 	v4l2/access.c \
+	v4l2/radio.c \
 	v4l2/controls.c \
+	v4l2/lib.c \
 	v4l2/v4l2.h
-libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS) $(LIBV4L2_CFLAGS)
-libv4l2_plugin_la_LIBADD = $(AM_LIBADD) $(LIBV4L2_LIBS) $(LIBM)
+libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS)
+libv4l2_plugin_la_LIBADD = $(AM_LIBADD) $(LIBDL) $(LIBM)
 libv4l2_plugin_la_DEPENDENCIES =
 if HAVE_V4L2
 libvlc_LTLIBRARIES += libv4l2_plugin.la
@@ -192,6 +185,7 @@ libdtv_plugin_la_DEPENDENCIES =
 
 if HAVE_LINUX_DVB
 libdtv_plugin_la_SOURCES += dtv/linux.c
+libdtv_plugin_la_CFLAGS += -DHAVE_LINUX_DVB
 if HAVE_DVBPSI
 libdtv_plugin_la_SOURCES += dtv/en50221.c dtv/en50221.h
 libdtv_plugin_la_CFLAGS += -DHAVE_DVBPSI $(DVBPSI_CFLAGS)
@@ -216,7 +210,6 @@ endif
 
 
 EXTRA_LTLIBRARIES += \
-	libaccess_rtmp_plugin.la \
 	libaccess_shm_plugin.la \
 	libaccess_smb_plugin.la \
 	$(NULL)