diff options
| author | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2011-12-07 13:52:17 +0100 |
|---|---|---|
| committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2011-12-07 13:54:27 +0100 |
| commit | 78810665f8ff86289d6a0cd093f8b6656a6d475d (patch) | |
| tree | 5f5eec58d00dca650eac9cfb9537aa6a297891f7 | |
| parent | fbc97f186fea083b6bcb021dbde4aa4a74f0c0f2 (diff) | |
Fix build on Ubuntu 11.10 (Oneric).
| -rw-r--r-- | docs/reference/libs/Makefile.am | 2 | ||||
| -rw-r--r-- | docs/reference/plugins/Makefile.am | 8 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 |
3 files changed, 13 insertions, 2 deletions
diff --git a/docs/reference/libs/Makefile.am b/docs/reference/libs/Makefile.am index 745a9324..f8eafeb2 100644 --- a/docs/reference/libs/Makefile.am +++ b/docs/reference/libs/Makefile.am @@ -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 += \ diff --git a/docs/reference/plugins/Makefile.am b/docs/reference/plugins/Makefile.am index 473ba988..457dfd13 100644 --- a/docs/reference/plugins/Makefile.am +++ b/docs/reference/plugins/Makefile.am @@ -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 diff --git a/tests/Makefile.am b/tests/Makefile.am index 40f28e3e..ba6490ab 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -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) |