[879/906] build: don't add X_CFLAGS to CFLAGS

It should already be included if needed inside GL_CFLAGS
This commit is contained in:
Matthew Waters 2014-02-20 22:40:05 +11:00
parent df0cfcbfa5
commit 75825b3626
2 changed files with 1 additions and 2 deletions

View file

@ -95,7 +95,6 @@ nodist_libgstgl_@GST_API_VERSION@include_HEADERS = \
libgstgl_@GST_API_VERSION@_la_CFLAGS = \ libgstgl_@GST_API_VERSION@_la_CFLAGS = \
-I$(top_srcdir)/gst-libs \ -I$(top_srcdir)/gst-libs \
$(GL_CFLAGS) \ $(GL_CFLAGS) \
$(X_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \
$(GST_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \
$(GST_CFLAGS) \ $(GST_CFLAGS) \

View file

@ -78,7 +78,7 @@ 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 = -I$(top_srcdir)/gst-libs $(GST_CFLAGS) $(X_CFLAGS) $(GST_BASE_CFLAGS) \ libgstopengl_la_CFLAGS = -I$(top_srcdir)/gst-libs $(GST_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_PLUGINS_BASE_CFLAGS) $(GL_CFLAGS) $(LIBPNG_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GL_CFLAGS) $(LIBPNG_CFLAGS)
libgstopengl_la_LIBADD = \ libgstopengl_la_LIBADD = \