X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2FModules.am;h=81d8e78edc214026ceff3b17996b7bdbc47b3c26;hb=3ddb9e51a7d11a69849ff427d38642d4f7d24f5e;hp=2db7a4ccfd18f1b3501abb95e8fe972fdf9e57d7;hpb=5ba0e02b363bbaffdd570b7bb16aa7277433cb56;p=vlc

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 2db7a4ccfd..81d8e78edc 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -55,7 +55,6 @@ SOURCES_dvdnav = dvdnav.c
 SOURCES_dvdread = dvdread.c
 SOURCES_dc1394 = dc1394.c
 SOURCES_pvr = pvr.c
-SOURCES_qtcapture = qtcapture.m
 SOURCES_linsys_sdi = linsys/linsys_sdi.c linsys/linsys_sdi.h
 SOURCES_linsys_hdsdi = \
 	linsys/linsys_hdsdi.c \
@@ -83,6 +82,23 @@ SOURCES_htcpcp = htcpcp.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
 
+if HAVE_QTKIT
+libqtcapture_plugin_la_SOURCES = qtcapture.m
+libqtcapture_plugin_la_LIBADDD = $(AM_LIBADD)
+libqtcapture_plugin_la_LDFLAGS = -Wl,-framework,Cocoa -Wl,-framework,QTKit -Wl,-framework,CoreVideo -Wl,-framework,QuartzCore
+libqtcapture_plugin_la_DEPENDENCIES =
+
+libqtsound_plugin_la_SOURCES = qtsound.m
+libqtsound_plugin_la_LIBADD = $(AM_LIBADD)
+libqtsound_plugin_la_LDFLAGS = -Wl,-framework,Cocoa -Wl,-framework,QTKit -Wl,-framework,CoreAudio
+libqtsound_plugin_la_DEPENDENCIES =
+
+libvlc_LTLIBRARIES += \
+        libqtcapture_plugin.la \
+        libqtsound_plugin.la \
+        $(NULL)
+endif
+
 libaccess_rtmp_plugin_la_SOURCES = \
         rtmp/access.c \
         rtmp/rtmp_amf_flv.c \
@@ -124,15 +140,31 @@ if HAVE_ALSA
 libvlc_LTLIBRARIES += libaccess_alsa_plugin.la
 endif
 
+libpulsesrc_plugin_la_SOURCES = \
+	../audio_output/vlcpulse.c \
+	../audio_output/vlcpulse.h \
+	pulse.c
+libpulsesrc_plugin_la_CFLAGS= $(AM_CFLAGS) $(PULSE_CFLAGS)
+libpulsesrc_plugin_la_LIBADD = $(AM_LIBADD) $(PULSE_LIBS)
+libpulsesrc_plugin_la_DEPENDENCIES =
+if HAVE_PULSE
+libvlc_LTLIBRARIES += libpulsesrc_plugin.la
+endif
+
 libaccess_shm_plugin_la_SOURCES = shm.c
 libaccess_shm_plugin_la_CFLAGS = $(AM_CFLAGS)
 libaccess_shm_plugin_la_LIBADD = $(AM_LIBADD)
 libaccess_shm_plugin_la_DEPENDENCIES =
 libvlc_LTLIBRARIES += $(LTLIBaccess_shm)
 
-libv4l2_plugin_la_SOURCES = v4l2.c
-libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS) $(CFLAGS_v4L2)
-libv4l2_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_v4l2)
+libv4l2_plugin_la_SOURCES = \
+	v4l2/video.c \
+	v4l2/demux.c \
+	v4l2/access.c \
+	v4l2/controls.c \
+	v4l2/v4l2.h
+libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS) $(LIBV4L2_CFLAGS)
+libv4l2_plugin_la_LIBADD = $(AM_LIBADD) $(LIBV4L2_LIBS) $(LIBM)
 libv4l2_plugin_la_DEPENDENCIES =
 if HAVE_V4L2
 libvlc_LTLIBRARIES += libv4l2_plugin.la
@@ -158,7 +190,7 @@ libdtv_plugin_la_CFLAGS = $(AM_CFLAGS)
 libdtv_plugin_la_LIBADD = $(AM_LIBADD)
 libdtv_plugin_la_DEPENDENCIES =
 
-if HAVE_LINUX
+if HAVE_LINUX_DVB
 libdtv_plugin_la_SOURCES += dtv/linux.c
 if HAVE_DVBPSI
 libdtv_plugin_la_SOURCES += dtv/en50221.c dtv/en50221.h