No functionnal changes (direct3d).

[vlc] / modules / access / Modules.am

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index db45a5fc1b800cdfb61ea175423b005af238971f..8d7bdce117c83c3fbc54ad020bf5a0df6123759e 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -3,13 +3,13 @@
 # obviously does not. Here is a fix for that.
 LIBTOOL=@LIBTOOL@ --tag=CC
 
-BASE_SUBDIRS = dvb mms rtp rtsp vcd vcdx screen bd zip
-EXTRA_SUBDIRS = bda dshow
+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 += bda dshow
+SUBDIRS += dshow
 endif
 
 libfilesystem_plugin_la_SOURCES = \
@@ -21,7 +21,11 @@ libfilesystem_plugin_la_CFLAGS = $(AM_CFLAGS)
 libfilesystem_plugin_la_LIBADD = $(AM_LIBADD)
 libfilesystem_plugin_la_DEPENDENCIES =
 
-SOURCES_access_mmap = mmap.c
+libsdp_plugin_la_SOURCES = sdp.c
+libsdp_plugin_la_CFLAGS = $(AM_CFLAGS)
+libsdp_plugin_la_LIBADD = $(AM_LIBADD)
+libsdp_plugin_la_DEPENDENCIES =
+
 SOURCES_access_directory = directory.c
 SOURCES_access_dv = dv.c
 SOURCES_access_udp = udp.c
@@ -34,9 +38,15 @@ SOURCES_access_eyetv = eyetv.m
 SOURCES_dvdnav = dvdnav.c
 SOURCES_dvdread = dvdread.c
 SOURCES_dc1394 = dc1394.c
-SOURCES_pvr = pvr.c videodev2.h
+SOURCES_pvr = pvr.c
 SOURCES_v4l2 = v4l2.c
 SOURCES_qtcapture = qtcapture.m
+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 \
@@ -53,6 +63,8 @@ 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
@@ -75,6 +87,7 @@ libvlc_LTLIBRARIES += \
        libaccess_ftp_plugin.la \
        libaccess_imem_plugin.la \
        libaccess_attachment_plugin.la \
+        libsdp_plugin.la \
        libaccess_rar_plugin.la \
        libstream_filter_rar_plugin.la \
        libaccess_vdr_plugin.la \
@@ -88,13 +101,53 @@ if HAVE_ALSA
 libvlc_LTLIBRARIES += libaccess_alsa_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)
+
 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 =
+if HAVE_XCB
+libvlc_LTLIBRARIES += libxcb_screen_plugin.la
+endif
+
+
+### Digital TV ###
+
+libdtv_plugin_la_SOURCES = \
+       dtv/dtv.h \
+       dtv/access.c
+libdtv_plugin_la_CFLAGS = $(AM_CFLAGS)
+libdtv_plugin_la_LIBADD = $(AM_LIBADD)
+libdtv_plugin_la_DEPENDENCIES =
+
+if HAVE_LINUX
+libdtv_plugin_la_SOURCES += dtv/linux.c
+libvlc_LTLIBRARIES += libdtv_plugin.la
+endif
+
+if HAVE_WIN32
+# Work-around automake bug:
+# Use an import library for C++ to retain C linker on other platforms.
+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
+
+libdtv_plugin_la_DEPENDENCIES += libbda.la
+libdtv_plugin_la_LIBADD += libbda.la -lstdc++
+libvlc_LTLIBRARIES += libdtv_plugin.la
+endif
+
+
+
 EXTRA_LTLIBRARIES += \
        libaccess_rtmp_plugin.la \
-       libxcb_screen_plugin.la
-libvlc_LTLIBRARIES += $(LTLIBxcb_screen)
+       libaccess_shm_plugin.la