projects / platform / upstream / gstreamer.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f895c07)
doc: conditional linking for scanner
authorVíctor Manuel Jáquez Leal <victorx.jaquez@intel.com>
Tue, 19 May 2015 08:57:42 +0000 (10:57 +0200)
committerVíctor Manuel Jáquez Leal <victorx.jaquez@intel.com>
Wed, 20 May 2015 16:03:44 +0000 (18:03 +0200)
Add x11 library only if it is enabled.

https://bugzilla.gnome.org/show_bug.cgi?id=749018

docs/reference/plugins/Makefile.am patch | blob | history

diff --git a/docs/reference/plugins/Makefile.am b/docs/reference/plugins/Makefile.am
index d3e2040..d933508 100644 (file)
--- a/docs/reference/plugins/Makefile.am
+++ b/docs/reference/plugins/Makefile.am
@@ -87,9 +87,18 @@ INCLUDES = \
        $(GST_CFLAGS) \
        $(NULL)
 
-GTKDOC_LIBS = \
+gtkdoc_vaapi_libs = \
        $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_API_VERSION).la \
+       $(NULL)
+
+if USE_X11
+gtkdoc_vaapi_libs += \
        $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-$(GST_API_VERSION).la \
+       $(NULL)
+endif
+
+GTKDOC_LIBS = \
+       $(gtkdoc_vaapi_libs) \
        $(top_builddir)/gst/vaapi/libgstvaapi.la \
        $(GLIB_LIBS) \
        $(GST_LIBS) \
Domain: Multimedia / Media Common;