From 14521a89cb199b6615d61f378d3495c20e2bff65 Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Mon, 24 Mar 2014 17:33:00 +0100 Subject: [PATCH] gl: fix out-of-source builds. Always use the locally generated file. Signed-off-by: Gwenole Beauchesne --- ext/gl/Makefile.am | 10 ++++++++-- gst-libs/gst/gl/Makefile.am | 1 + gst-libs/gst/gl/wayland/Makefile.am | 1 + gst-libs/gst/gl/x11/Makefile.am | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ext/gl/Makefile.am b/ext/gl/Makefile.am index d87f881cc7..2a3cdfec13 100644 --- a/ext/gl/Makefile.am +++ b/ext/gl/Makefile.am @@ -78,8 +78,14 @@ libgstopengl_la_SOURCES = \ # check order of CFLAGS and LIBS, shouldn't the order be the other way around # (like in AM_CFLAGS)? -libgstopengl_la_CFLAGS = -I$(top_srcdir)/gst-libs $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) $(GL_CFLAGS) $(LIBPNG_CFLAGS) +libgstopengl_la_CFLAGS = \ + -I$(top_srcdir)/gst-libs \ + -I$(top_builddir)/gst-libs \ + $(GST_CFLAGS) \ + $(GST_BASE_CFLAGS) \ + $(GST_PLUGINS_BASE_CFLAGS) \ + $(GL_CFLAGS) \ + $(LIBPNG_CFLAGS) libgstopengl_la_LIBADD = \ $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \ diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am index cb41fe0c58..3923259106 100644 --- a/gst-libs/gst/gl/Makefile.am +++ b/gst-libs/gst/gl/Makefile.am @@ -98,6 +98,7 @@ nodist_libgstgl_@GST_API_VERSION@include_HEADERS = \ libgstgl_@GST_API_VERSION@_la_CFLAGS = \ -I$(top_srcdir)/gst-libs \ + -I$(top_builddir)/gst-libs \ $(GL_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ diff --git a/gst-libs/gst/gl/wayland/Makefile.am b/gst-libs/gst/gl/wayland/Makefile.am index 1d5a7171fb..9006e672ac 100644 --- a/gst-libs/gst/gl/wayland/Makefile.am +++ b/gst-libs/gst/gl/wayland/Makefile.am @@ -12,6 +12,7 @@ noinst_HEADERS = \ libgstgl_wayland_la_CFLAGS = \ -I$(top_srcdir)/gst-libs \ + -I$(top_builddir)/gst-libs \ $(GL_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ diff --git a/gst-libs/gst/gl/x11/Makefile.am b/gst-libs/gst/gl/x11/Makefile.am index 9626d84825..c8d9b69b6c 100644 --- a/gst-libs/gst/gl/x11/Makefile.am +++ b/gst-libs/gst/gl/x11/Makefile.am @@ -27,6 +27,7 @@ endif libgstgl_x11_la_CFLAGS = \ -I$(top_srcdir)/gst-libs \ + -I$(top_builddir)/gst-libs \ $(GL_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \