[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
This commit is contained in:
Matthew Waters 2013-08-13 20:10:56 +10:00
parent bfac5a8d76
commit b5d595f402
6 changed files with 14 additions and 15 deletions

View file

@ -12,11 +12,11 @@ libgstglandroidinclude_HEADERS = \
gstglwindow_android_egl.h gstglwindow_android_egl.h
libgstgl_android_la_CFLAGS = \ libgstgl_android_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \
$(GL_CFLAGS) \ $(GL_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \ $(GST_CFLAGS)
-I$(top_srcdir)/gst-libs
libgstgl_android_la_LDFLAGS = \ libgstgl_android_la_LDFLAGS = \
$(GST_LIB_LDFLAGS) \ $(GST_LIB_LDFLAGS) \

View file

@ -9,21 +9,21 @@ noinst_HEADERS = \
gstglwindow_cocoa.h gstglwindow_cocoa.h
libgstgl_cocoa_la_CFLAGS = \ libgstgl_cocoa_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \
$(GL_CFLAGS) \ $(GL_CFLAGS) \
$(X_CFLAGS) \ $(X_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \ $(GST_CFLAGS)
-I$(top_srcdir)/gst-libs
libgstgl_cocoa_la_OBJCFLAGS = \ libgstgl_cocoa_la_OBJCFLAGS = \
-I$(top_srcdir)/gst-libs \
$(GL_CFLAGS) \ $(GL_CFLAGS) \
$(GL_OBJCFLAGS) \ $(GL_OBJCFLAGS) \
$(X_CFLAGS) \ $(X_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \ $(GST_CFLAGS)
-I$(top_srcdir)/gst-libs
libgstgl_cocoa_la_LDFLAGS = \ libgstgl_cocoa_la_LDFLAGS = \
$(GST_LIB_LDFLAGS) \ $(GST_LIB_LDFLAGS) \

View file

@ -11,12 +11,12 @@ noinst_HEADERS = \
wayland_event_source.h wayland_event_source.h
libgstgl_wayland_la_CFLAGS = \ libgstgl_wayland_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \
$(GL_CFLAGS) \ $(GL_CFLAGS) \
$(X_CFLAGS) \ $(X_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \ $(GST_CFLAGS)
-I$(top_srcdir)/gst-libs
libgstgl_wayland_la_LDFLAGS = \ libgstgl_wayland_la_LDFLAGS = \
$(GST_LIB_LDFLAGS) \ $(GST_LIB_LDFLAGS) \

View file

@ -18,12 +18,12 @@ noinst_HEADERS += gstglwindow_win32_egl.h
endif endif
libgstgl_win32_la_CFLAGS = \ libgstgl_win32_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \
$(GL_CFLAGS) \ $(GL_CFLAGS) \
$(X_CFLAGS) \ $(X_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \ $(GST_CFLAGS)
-I$(top_srcdir)/gst-libs
libgstgl_win32_la_LDFLAGS = \ libgstgl_win32_la_LDFLAGS = \
$(GST_LIB_LDFLAGS) \ $(GST_LIB_LDFLAGS) \

View file

@ -20,12 +20,12 @@ noinst_HEADERS += gstglwindow_x11_egl.h
endif endif
libgstgl_x11_la_CFLAGS = \ libgstgl_x11_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \
$(GL_CFLAGS) \ $(GL_CFLAGS) \
$(X_CFLAGS) \ $(X_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \ $(GST_CFLAGS)
-I$(top_srcdir)/gst-libs
libgstgl_x11_la_LDFLAGS = \ libgstgl_x11_la_LDFLAGS = \
$(GST_LIB_LDFLAGS) \ $(GST_LIB_LDFLAGS) \

View file

@ -76,9 +76,8 @@ libgstopengl_la_SOURCES = \
# check order of CFLAGS and LIBS, shouldn't the order be the other way around # check order of CFLAGS and LIBS, shouldn't the order be the other way around
# (like in AM_CFLAGS)? # (like in AM_CFLAGS)?
libgstopengl_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \ libgstopengl_la_CFLAGS = -I$(top_srcdir)/gst-libs $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(GL_CFLAGS) $(LIBPNG_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) $(GL_CFLAGS) $(LIBPNG_CFLAGS)
-I$(top_srcdir)/gst-libs
libgstopengl_la_LIBADD = \ libgstopengl_la_LIBADD = \
$(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \ $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la \