diff options
| author | Matthew Waters <ystreet00@gmail.com> | 2014-02-20 22:40:05 +1100 |
|---|---|---|
| committer | Matthew Waters <ystreet00@gmail.com> | 2014-02-21 00:37:58 +1100 |
| commit | 7a80837b90fc40756d9c96ff24a0abf48065c61b (patch) | |
| tree | 6715542c179801510ea39b6d2d4cca8dff440c78 | |
| parent | cbf1d559463b4e79a999f35814ad4d83deb98c5a (diff) | |
build: don't add X_CFLAGS to CFLAGS
It should already be included if needed inside GL_CFLAGS
| -rw-r--r-- | gst-libs/gst/gl/Makefile.am | 1 | ||||
| -rw-r--r-- | gst/gl/Makefile.am | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am index 23c6d6c..8ae13ad 100644 --- a/gst-libs/gst/gl/Makefile.am +++ b/gst-libs/gst/gl/Makefile.am @@ -95,7 +95,6 @@ nodist_libgstgl_@GST_API_VERSION@include_HEADERS = \ libgstgl_@GST_API_VERSION@_la_CFLAGS = \ -I$(top_srcdir)/gst-libs \ $(GL_CFLAGS) \ - $(X_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) \ diff --git a/gst/gl/Makefile.am b/gst/gl/Makefile.am index c7a59b6..1333a45 100644 --- a/gst/gl/Makefile.am +++ b/gst/gl/Makefile.am @@ -78,7 +78,7 @@ 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) $(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) libgstopengl_la_LIBADD = \ |