From b5d595f402150835d1303b678288e6632d390c80 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Tue, 13 Aug 2013 20:10:56 +1000 Subject: [PATCH] [792/906] build: use our own in tree headers before system ones allows us to develop against the tree rather than what may be installed --- gst-libs/gst/gl/android/Makefile.am | 4 ++-- gst-libs/gst/gl/cocoa/Makefile.am | 8 ++++---- gst-libs/gst/gl/wayland/Makefile.am | 4 ++-- gst-libs/gst/gl/win32/Makefile.am | 4 ++-- gst-libs/gst/gl/x11/Makefile.am | 4 ++-- gst/gl/Makefile.am | 5 ++--- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/gst-libs/gst/gl/android/Makefile.am b/gst-libs/gst/gl/android/Makefile.am index 8c17682b62..2bf0663b4c 100644 --- a/gst-libs/gst/gl/android/Makefile.am +++ b/gst-libs/gst/gl/android/Makefile.am @@ -12,11 +12,11 @@ libgstglandroidinclude_HEADERS = \ gstglwindow_android_egl.h libgstgl_android_la_CFLAGS = \ + -I$(top_srcdir)/gst-libs \ $(GL_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ - $(GST_CFLAGS) \ - -I$(top_srcdir)/gst-libs + $(GST_CFLAGS) libgstgl_android_la_LDFLAGS = \ $(GST_LIB_LDFLAGS) \ diff --git a/gst-libs/gst/gl/cocoa/Makefile.am b/gst-libs/gst/gl/cocoa/Makefile.am index ca8b9a3bbc..4f21d66de4 100644 --- a/gst-libs/gst/gl/cocoa/Makefile.am +++ b/gst-libs/gst/gl/cocoa/Makefile.am @@ -9,21 +9,21 @@ noinst_HEADERS = \ gstglwindow_cocoa.h libgstgl_cocoa_la_CFLAGS = \ + -I$(top_srcdir)/gst-libs \ $(GL_CFLAGS) \ $(X_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ - $(GST_CFLAGS) \ - -I$(top_srcdir)/gst-libs + $(GST_CFLAGS) libgstgl_cocoa_la_OBJCFLAGS = \ + -I$(top_srcdir)/gst-libs \ $(GL_CFLAGS) \ $(GL_OBJCFLAGS) \ $(X_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ - $(GST_CFLAGS) \ - -I$(top_srcdir)/gst-libs + $(GST_CFLAGS) libgstgl_cocoa_la_LDFLAGS = \ $(GST_LIB_LDFLAGS) \ diff --git a/gst-libs/gst/gl/wayland/Makefile.am b/gst-libs/gst/gl/wayland/Makefile.am index daa5279a7c..4958761cdb 100644 --- a/gst-libs/gst/gl/wayland/Makefile.am +++ b/gst-libs/gst/gl/wayland/Makefile.am @@ -11,12 +11,12 @@ noinst_HEADERS = \ wayland_event_source.h libgstgl_wayland_la_CFLAGS = \ + -I$(top_srcdir)/gst-libs \ $(GL_CFLAGS) \ $(X_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ - $(GST_CFLAGS) \ - -I$(top_srcdir)/gst-libs + $(GST_CFLAGS) libgstgl_wayland_la_LDFLAGS = \ $(GST_LIB_LDFLAGS) \ diff --git a/gst-libs/gst/gl/win32/Makefile.am b/gst-libs/gst/gl/win32/Makefile.am index 78dddc3e65..62768670d6 100644 --- a/gst-libs/gst/gl/win32/Makefile.am +++ b/gst-libs/gst/gl/win32/Makefile.am @@ -18,12 +18,12 @@ noinst_HEADERS += gstglwindow_win32_egl.h endif libgstgl_win32_la_CFLAGS = \ + -I$(top_srcdir)/gst-libs \ $(GL_CFLAGS) \ $(X_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ - $(GST_CFLAGS) \ - -I$(top_srcdir)/gst-libs + $(GST_CFLAGS) libgstgl_win32_la_LDFLAGS = \ $(GST_LIB_LDFLAGS) \ diff --git a/gst-libs/gst/gl/x11/Makefile.am b/gst-libs/gst/gl/x11/Makefile.am index 076b5c302c..0dbcb4482e 100644 --- a/gst-libs/gst/gl/x11/Makefile.am +++ b/gst-libs/gst/gl/x11/Makefile.am @@ -20,12 +20,12 @@ noinst_HEADERS += gstglwindow_x11_egl.h endif libgstgl_x11_la_CFLAGS = \ + -I$(top_srcdir)/gst-libs \ $(GL_CFLAGS) \ $(X_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ - $(GST_CFLAGS) \ - -I$(top_srcdir)/gst-libs + $(GST_CFLAGS) libgstgl_x11_la_LDFLAGS = \ $(GST_LIB_LDFLAGS) \ diff --git a/gst/gl/Makefile.am b/gst/gl/Makefile.am index 66d61bc32d..2c2b53701b 100644 --- a/gst/gl/Makefile.am +++ b/gst/gl/Makefile.am @@ -76,9 +76,8 @@ 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 = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \ - $(GST_PLUGINS_BASE_CFLAGS) $(GL_CFLAGS) $(LIBPNG_CFLAGS) \ - -I$(top_srcdir)/gst-libs +libgstopengl_la_CFLAGS = -I$(top_srcdir)/gst-libs $(GST_CFLAGS) $(X_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 \