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

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index be8c47b8fe..71d2c8c70b 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -1,16 +1,5 @@
-# Automake forgets to add a proper tag to libtool with Objective-C files.
-# Moreover Libtool should default tag to CC when none is specified but
-# obviously does not. Here is a fix for that.
-LIBTOOL=@LIBTOOL@ --tag=CC
-
-BASE_SUBDIRS = mms rtp rtsp vcd vcdx screen bd zip
-EXTRA_SUBDIRS = dshow
-SUBDIRS = $(BASE_SUBDIRS)
-DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
-
-if HAVE_WIN32
-SUBDIRS += dshow
-endif
+SUBDIRS = rtp
+noinst_LTLIBRARIES =
 
 libfilesystem_plugin_la_SOURCES = \
 	fs.h \
@@ -22,62 +11,50 @@ libfilesystem_plugin_la_LIBADD = $(AM_LIBADD)
 if HAVE_WIN32
 libfilesystem_plugin_la_LIBADD += -lshlwapi
 endif
-libfilesystem_plugin_la_DEPENDENCIES =
 
 libidummy_plugin_la_SOURCES = idummy.c
 libidummy_plugin_la_CFLAGS = $(AM_CFLAGS)
 libidummy_plugin_la_LIBADD = $(AM_LIBADD)
-libidummy_plugin_la_DEPENDENCIES =
 
 libsdp_plugin_la_SOURCES = sdp.c
 libsdp_plugin_la_CFLAGS = $(AM_CFLAGS)
 libsdp_plugin_la_LIBADD = $(AM_LIBADD)
-libsdp_plugin_la_DEPENDENCIES =
 
-libaccess_smb_plugin_la_SOURCES = smb.c
-libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS)
-libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
-if HAVE_WIN32
-libaccess_smb_plugin_la_LIBADD += -lmpr
+libzip_plugin_la_SOURCES = zip/zip.h zip/zipstream.c zip/zipaccess.c
+libzip_plugin_la_CFLAGS = $(AM_CFLAGS) $(MINIZIP_CFLAGS)
+libzip_plugin_la_LIBADD = $(AM_LIBADD) $(MINIZIP_LIBS)
+if HAVE_ZLIB
+libvlc_LTLIBRARIES += libzip_plugin.la
+if !HAVE_MINIZIP
+libunzip_la_SOURCES = zip/unzip/unzip.c zip/unzip/unzip.h zip/unzip/crypt.h \
+	zip/unzip/ioapi.c zip/unzip/ioapi.h
+libunzip_la_LIBADD = -lz
+libunzip_la_LDFLAGS = -static
+noinst_LTLIBRARIES += libunzip.la
+libzip_plugin_la_CFLAGS += -I$(srcdir)/zip/unzip
+libzip_plugin_la_LIBADD += libunzip.la
+endif
 endif
-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
-SOURCES_access_ftp = ftp.c
 SOURCES_access_gnomevfs = gnomevfs.c
 SOURCES_access_eyetv = eyetv.m
-SOURCES_dvdnav = dvdnav.c
-SOURCES_dvdread = dvdread.c
 SOURCES_dc1394 = dc1394.c
-SOURCES_pvr = pvr.c
+SOURCES_dv1394 = dv.c
 SOURCES_linsys_sdi = linsys/linsys_sdi.c linsys/linsys_sdi.h
 SOURCES_linsys_hdsdi = \
 	linsys/linsys_hdsdi.c \
 	linsys/linsys_sdiaudio.h \
 	linsys/linsys_sdivideo.h \
 	$(NULL)
-SOURCES_cdda = \
-        cdda.c \
-        vcd/cdrom.c \
-        vcd/cdrom.h \
-        vcd/cdrom_internals.h \
-        $(NULL)
 SOURCES_access_jack = jack.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_avio = avio.c avio.h ../codec/avcodec/cpu.c
 SOURCES_access_attachment = attachment.c
 SOURCES_access_vdr = vdr.c
 SOURCES_libbluray = bluray.c
 SOURCES_decklink = decklink.cpp
-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
@@ -86,12 +63,10 @@ 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 \
@@ -99,16 +74,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 \
@@ -124,10 +89,12 @@ libvlc_LTLIBRARIES += \
 	libaccess_vdr_plugin.la \
 	$(NULL)
 
+
+### Audio capture ###
+
 libaccess_oss_plugin_la_SOURCES = oss.c
 libaccess_oss_plugin_la_CFLAGS = $(AM_CFLAGS)
 libaccess_oss_plugin_la_LIBADD = $(AM_LIBADD) $(OSS_LIBS)
-libaccess_oss_plugin_la_DEPENDENCIES =
 if HAVE_OSS
 libvlc_LTLIBRARIES += libaccess_oss_plugin.la
 endif
@@ -135,7 +102,6 @@ endif
 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
@@ -146,40 +112,99 @@ libpulsesrc_plugin_la_SOURCES = \
 	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)
+
+### Video capture ###
+
+libshm_plugin_la_SOURCES = shm.c
+libshm_plugin_la_CFLAGS = $(AM_CFLAGS)
+libshm_plugin_la_LIBADD = $(AM_LIBADD)
+if !HAVE_WIN32
+if !HAVE_OS2
+libvlc_LTLIBRARIES += libshm_plugin.la
+endif
+endif
 
 libv4l2_plugin_la_SOURCES = \
+	v4l2/videodev2.h \
+	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_DEPENDENCIES =
+libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS)
+libv4l2_plugin_la_LIBADD = $(AM_LIBADD) $(LIBDL) $(LIBM)
 if HAVE_V4L2
 libvlc_LTLIBRARIES += libv4l2_plugin.la
 endif
 
+libdshow_plugin_la_SOURCES = dshow/vlc_dshow.h dshow/dshow.cpp dshow/access.h \
+	dshow/filter.cpp dshow/filter.h dshow/crossbar.cpp
+libdshow_plugin_la_CFLAGS = $(AM_CFLAGS)
+libdshow_plugin_la_LIBADD = $(AM_LIBADD) -lole32 -loleaut32 -luuid -lstrmiids -lksuser
+if HAVE_WIN32
+libvlc_LTLIBRARIES += libdshow_plugin.la
+endif
+
+
+### Screen grab ###
+
 libxcb_screen_plugin_la_SOURCES = screen/xcb.c
 libxcb_screen_plugin_la_CFLAGS = $(AM_CFLAGS) \
 	$(XCB_CFLAGS) $(XCB_COMPOSITE_CFLAGS)
 libxcb_screen_plugin_la_LIBADD = $(AM_LIBADD) \
 	$(XCB_LIBS) $(XCB_COMPOSITE_LIBS)
-libxcb_screen_plugin_la_DEPENDENCIES =
 if HAVE_XCB
 libvlc_LTLIBRARIES += libxcb_screen_plugin.la
 endif
 
+libscreen_plugin_la_SOURCES = screen/screen.c screen/screen.h
+libscreen_plugin_la_CFLAGS = $(AM_CFLAGS)
+libscreen_plugin_la_LIBADD = $(AM_LIBADD)
+if HAVE_WIN32
+libscreen_plugin_la_SOURCES += screen/win32.c
+libscreen_plugin_la_LIBADD += -lgdi32
+libvlc_LTLIBRARIES += libscreen_plugin.la
+endif
+if HAVE_DARWIN
+libscreen_plugin_la_SOURCES += screen/mac.c
+libscreen_plugin_la_LDFLAGS = $(AM_LDFLAGS)
+libscreen_plugin_la_LDFLAGS += "-Wl,-framework,OpenGL,-framework,ApplicationServices"
+endif
+
+
+### Optical media ###
+
+SOURCES_cdda = \
+        cdda.c \
+        vcd/cdrom.c \
+        vcd/cdrom.h \
+        vcd/cdrom_internals.h
+SOURCES_vcd = \
+	vcd/vcd.c \
+	vcd/cdrom.c \
+	vcd/cdrom.h \
+	vcd/cdrom_internals.h
+SOURCES_vcdx = \
+	vcdx/access.h vcdx/access.c \
+	vcdx/vcd.c vcdx/vcd.h \
+	vcdx/vcdplayer.h vcdx/vcdplayer.c \
+	vcdx/info.c vcdx/info.h
+
+SOURCES_dvdnav = dvdnav.c
+SOURCES_dvdread = dvdread.c
+
+libaccess_bd_plugin_la_SOURCES = bd/bd.c bd/mpls.c bd/mpls.h bd/clpi.c bd/clpi.h
+libaccess_bd_plugin_la_CFLAGS = $(AM_CFLAGS)
+libaccess_bd_plugin_la_LIBADD = $(AM_LIBADD)
+libvlc_LTLIBRARIES += libaccess_bd_plugin.la
+
 
 ### Digital TV ###
 
@@ -188,10 +213,10 @@ libdtv_plugin_la_SOURCES = \
 	dtv/access.c
 libdtv_plugin_la_CFLAGS = $(AM_CFLAGS)
 libdtv_plugin_la_LIBADD = $(AM_LIBADD)
-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)
@@ -207,16 +232,66 @@ libbda_la_SOURCES = dtv/bdadefs.h dtv/bdagraph.cpp dtv/bdagraph.hpp
 libbda_la_CXXFLAGS = $(AM_CXXFLAGS)
 libbda_la_LDFLAGS = -static
 libbda_la_LIBADD = -lstrmiids -lole32 -loleaut32 -luuid
-noinst_LTLIBRARIES = libbda.la
+noinst_LTLIBRARIES += libbda.la
 
-libdtv_plugin_la_DEPENDENCIES += libbda.la
+libdtv_plugin_la_DEPENDENCIES = libbda.la
 libdtv_plugin_la_LIBADD += libbda.la -lstdc++
 libvlc_LTLIBRARIES += libdtv_plugin.la
 endif
 
+# Old Linux DVB scanner
+libdvb_plugin_la_SOURCES = \
+	dvb/access.c \
+	dvb/linux_dvb.c \
+	dvb/scan.c dvb/scan.h \
+	dvb/dvb.h
+libdvb_plugin_la_CFLAGS = $(AM_CFLAGS)
+libdvb_plugin_la_LIBADD = $(AM_LIBADD)
+if HAVE_LINUX_DVB
+libvlc_LTLIBRARIES += libdvb_plugin.la
+if HAVE_DVBPSI
+libdvb_plugin_la_CFLAGS += $(DVBPSI_CFLAGS)
+libdvb_plugin_la_LIBADD += $(DVBPSI_LIBS)
+endif
+endif
 
-EXTRA_LTLIBRARIES += \
-	libaccess_rtmp_plugin.la \
-	libaccess_shm_plugin.la \
-	libaccess_smb_plugin.la \
-	$(NULL)
+### Network streams ###
+
+libaccess_smb_plugin_la_SOURCES = smb.c
+libaccess_smb_plugin_la_CFLAGS = $(AM_CFLAGS)
+libaccess_smb_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_access_smb)
+if HAVE_WIN32
+libaccess_smb_plugin_la_LIBADD += -lmpr
+endif
+libvlc_LTLIBRARIES += $(LTLIBaccess_smb)
+EXTRA_LTLIBRARIES += libaccess_smb_plugin.la
+
+SOURCES_access_udp = udp.c
+SOURCES_access_tcp = tcp.c
+SOURCES_access_http = http.c
+SOURCES_htcpcp = htcpcp.c
+SOURCES_access_ftp = ftp.c
+SOURCES_access_sftp = sftp.c
+
+libaccess_mms_plugin_la_SOURCES = \
+	mms/mms.c mms/mms.h \
+	mms/mmsh.c mms/mmsh.h \
+	mms/mmstu.c mms/mmstu.h \
+	mms/buffer.c mms/buffer.h \
+	mms/asf.h mms/asf.c \
+	../demux/asf/libasf_guid.h
+libaccess_mms_plugin_la_CFLAGS = $(AM_CFLAGS)
+libaccess_mms_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libvlc_LTLIBRARIES += libaccess_mms_plugin.la
+
+libaccess_realrtsp_plugin_la_SOURCES = \
+	rtsp/access.c \
+	rtsp/rtsp.c rtsp/rtsp.h \
+	rtsp/real.c rtsp/real.h \
+	rtsp/real_rmff.c rtsp/real_rmff.h \
+	rtsp/real_sdpplin.c rtsp/real_sdpplin.h \
+	rtsp/real_asmrp.c
+libaccess_realrtsp_plugin_la_CFLAGS = $(AM_CFLAGS)
+libaccess_realrtsp_plugin_la_LIBADD = $(AM_LIBADD) $(SOCKET_LIBS)
+libvlc_LTLIBRARIES += $(LTLIBaccess_realrtsp)
+EXTRA_LTLIBRARIES += libaccess_realrtsp_plugin.la