mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-03-28 03:45:39 +00:00
Fix build on Ubuntu 11.10 (Oneric).
This commit is contained in:
parent
fbc97f186f
commit
78810665f8
3 changed files with 13 additions and 2 deletions
|
@ -102,12 +102,14 @@ expand_content_files = \
|
|||
|
||||
INCLUDES = \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(GST_CFLAGS) \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/gst-libs \
|
||||
-I$(top_srcdir)/gst-libs/gst/vaapi
|
||||
|
||||
GTKDOC_LIBS = \
|
||||
$(GLIB_LIBS) \
|
||||
$(GST_LIBS) \
|
||||
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_MAJORMINOR).la
|
||||
|
||||
GTKDOC_LIBS += \
|
||||
|
|
|
@ -83,7 +83,9 @@ INCLUDES = \
|
|||
-I$(top_srcdir) \
|
||||
-I$(top_srcdir)/gst-libs \
|
||||
-I$(top_srcdir)/gst-libs/gst/vaapi \
|
||||
$(GLIB_CFLAGS)
|
||||
$(GLIB_CFLAGS) \
|
||||
$(GST_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
GTKDOC_LIBS = \
|
||||
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-$(GST_MAJORMINOR).la \
|
||||
|
@ -91,7 +93,9 @@ GTKDOC_LIBS = \
|
|||
$(top_builddir)/gst/vaapidecode/libgstvaapidecode.la \
|
||||
$(top_builddir)/gst/vaapiconvert/libgstvaapiconvert.la \
|
||||
$(top_builddir)/gst/vaapisink/libgstvaapisink.la \
|
||||
$(GLIB_LIBS)
|
||||
$(GLIB_LIBS) \
|
||||
$(GST_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
# This includes the standard gtk-doc make rules, copied by gtkdocize.
|
||||
include $(top_srcdir)/gtk-doc.make
|
||||
|
|
|
@ -20,14 +20,19 @@ TEST_MIX_CFLAGS += $(TEST_GLX_CFLAGS)
|
|||
endif
|
||||
|
||||
TEST_LIBS = \
|
||||
$(GST_LIBS) \
|
||||
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-@GST_MAJORMINOR@.la
|
||||
|
||||
TEST_X11_LIBS = \
|
||||
$(X11_LIBS) \
|
||||
$(GST_LIBS) \
|
||||
$(LIBVA_X11_LIBS) \
|
||||
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-x11-@GST_MAJORMINOR@.la
|
||||
|
||||
TEST_GLX_LIBS = \
|
||||
$(GLX_LIBS) \
|
||||
$(GST_LIBS) \
|
||||
$(LIBVA_GLX_LIBS) \
|
||||
$(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx-@GST_MAJORMINOR@.la
|
||||
|
||||
TEST_MIX_LIBS = $(TEST_X11_LIBS)
|
||||
|
|
Loading…
Reference in a new issue