decklink: update build rules

Move logic to Modules.am
Use CXXFLAGS

diff --git a/configure.ac b/configure.ac
index dbd27dddbc110ae2c5f5755ba069ced13ac91351..512ee5a0f8514db168601247b27fc72b385c5e55 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1749,17 +1749,19 @@ if test "${enable_decklink}" != "no"
 then
   if test "${with_decklink_sdk}" != "no" -a -n "${with_decklink_sdk}"
   then
-    VLC_ADD_CPPFLAGS([decklink],[-I${with_decklink_sdk}/include])
+    VLC_ADD_CXXFLAGS([decklink],[-I${with_decklink_sdk}/include])
   fi
   VLC_SAVE_FLAGS
-  CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_decklink}"
+  CXXFLAGS="${CXXFLAGS} ${CXXFLAGS_decklink}"
   AC_LANG_PUSH(C++)
-  AC_CHECK_HEADERS(DeckLinkAPIDispatch.cpp, [
-    VLC_ADD_PLUGIN([decklink])
-  ],[AC_MSG_WARN(Blackmagic DeckLink SDI include files not found, decklink disabled)])
+  AC_CHECK_HEADERS(DeckLinkAPIDispatch.cpp, [], [
+      have_decklink=no
+      AC_MSG_WARN(Blackmagic DeckLink SDI include files not found, decklink disabled)
+  ])
   AC_LANG_POP(C++)
   VLC_RESTORE_FLAGS
 fi
+AM_CONDITIONAL(HAVE_DECKLINK, [ test "${have_decklink}" != "no" ])
 
 
 dnl

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index c04485d4a92914410613385478e6c50b436ff7c1..d60945fa3c944eb656578ad7fce8954a8efdb387 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -54,11 +54,17 @@ 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_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_DECKLINK
+libdecklink_plugin_la_SOURCES = decklink.cpp
+libdecklink_plugin_la_CXXFLAGS = $(AM_CFLAGS) $(CXXFLAGS_decklink)
+libdecklink_plugin_la_LIBADD = $(AM_LIBADD) $(LIBS_decklink) -ldl
+libvlc_LTLIBRARIES += libdecklink_plugin.la
+endif
+
 if HAVE_QTKIT
 libqtcapture_plugin_la_SOURCES = qtcapture.m
 libqtcapture_plugin_la_LIBADDD = $(AM_LIBADD)