dtv: More detailed DiSEqC error messages.

[vlc] / modules / access / Modules.am

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index 9722720380764fbbaf9f51db510fa1a07dc056d4..e6c1b41028b83398818540afdc4483cee3ef9d6c 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -64,7 +64,7 @@ SOURCES_stream_filter_rar = rar/rar.c rar/rar.h rar/stream.c
 
 if HAVE_DECKLINK
 libdecklink_plugin_la_SOURCES = decklink.cpp
-libdecklink_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CXXFLAGS_decklink)
+libdecklink_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CPPFLAGS_decklink)
 libdecklink_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_decklink) -ldl
 libvlc_LTLIBRARIES += libdecklink_plugin.la
 endif
@@ -136,7 +136,9 @@ libshm_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM)
 libvlc_LTLIBRARIES += libshm_plugin.la
 
 libv4l2_plugin_la_SOURCES = \
-       v4l2/videodev2.h \
+       v4l2/linux/videodev2.h \
+       v4l2/linux/v4l2-common.h \
+       v4l2/linux/v4l2-controls.h \
        v4l2/v4l2.c \
        v4l2/video.c \
        v4l2/vbi.c \
@@ -146,6 +148,7 @@ libv4l2_plugin_la_SOURCES = \
        v4l2/controls.c \
        v4l2/lib.c \
        v4l2/v4l2.h
+libv4l2_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/v4l2
 libv4l2_plugin_la_CFLAGS = $(AM_CFLAGS) $(ZVBI_CFLAGS)
 libv4l2_plugin_la_LIBADD = $(AM_LIBADD) $(LIBDL) $(LIBM) $(ZVBI_LIBS)
 if HAVE_V4L2
@@ -180,13 +183,18 @@ libscreen_plugin_la_SOURCES += screen/win32.c
 libscreen_plugin_la_LIBADD += -lgdi32
 libvlc_LTLIBRARIES += libscreen_plugin.la
 endif
-if HAVE_DARWIN
+if HAVE_MAC_SCREEN
 libscreen_plugin_la_SOURCES += screen/mac.c
 libscreen_plugin_la_LDFLAGS = $(AM_LDFLAGS)
 libscreen_plugin_la_LDFLAGS += "-Wl,-framework,OpenGL,-framework,ApplicationServices"
 libvlc_LTLIBRARIES += libscreen_plugin.la
 endif
 
+### VNC ###
+SOURCES_libvnc = vnc.c
+
+### RDP / Remote Desktop ###
+SOURCES_rdp = rdp.c
 
 ### Optical media ###