From 0fa966bb3de29ddced127d247781e096216b2a0c Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Mon, 24 Mar 2014 23:09:20 +1100 Subject: [PATCH] gl: remove explicit reference to X_CFLAGS They are in GL_CFLAGS if required --- gst-libs/gst/gl/cocoa/Makefile.am | 2 -- gst-libs/gst/gl/dispmanx/Makefile.am | 1 - gst-libs/gst/gl/wayland/Makefile.am | 1 - gst-libs/gst/gl/win32/Makefile.am | 1 - gst-libs/gst/gl/x11/Makefile.am | 1 - 5 files changed, 6 deletions(-) diff --git a/gst-libs/gst/gl/cocoa/Makefile.am b/gst-libs/gst/gl/cocoa/Makefile.am index aca8dc852e..34793c0c1c 100644 --- a/gst-libs/gst/gl/cocoa/Makefile.am +++ b/gst-libs/gst/gl/cocoa/Makefile.am @@ -14,7 +14,6 @@ noinst_HEADERS = \ libgstgl_cocoa_la_CFLAGS = \ -I$(top_srcdir)/gst-libs \ $(GL_CFLAGS) \ - $(X_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) @@ -23,7 +22,6 @@ libgstgl_cocoa_la_OBJCFLAGS = \ -I$(top_srcdir)/gst-libs \ $(GL_CFLAGS) \ $(GL_OBJCFLAGS) \ - $(X_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) diff --git a/gst-libs/gst/gl/dispmanx/Makefile.am b/gst-libs/gst/gl/dispmanx/Makefile.am index fd14286ea0..b95dc2f538 100644 --- a/gst-libs/gst/gl/dispmanx/Makefile.am +++ b/gst-libs/gst/gl/dispmanx/Makefile.am @@ -11,7 +11,6 @@ noinst_HEADERS = \ libgstgl_dispmanx_la_CFLAGS = \ -I$(top_srcdir)/gst-libs \ $(GL_CFLAGS) \ - $(X_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) diff --git a/gst-libs/gst/gl/wayland/Makefile.am b/gst-libs/gst/gl/wayland/Makefile.am index 4958761cdb..1d5a7171fb 100644 --- a/gst-libs/gst/gl/wayland/Makefile.am +++ b/gst-libs/gst/gl/wayland/Makefile.am @@ -13,7 +13,6 @@ noinst_HEADERS = \ libgstgl_wayland_la_CFLAGS = \ -I$(top_srcdir)/gst-libs \ $(GL_CFLAGS) \ - $(X_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) diff --git a/gst-libs/gst/gl/win32/Makefile.am b/gst-libs/gst/gl/win32/Makefile.am index 6ec6599451..1e78e1cc10 100644 --- a/gst-libs/gst/gl/win32/Makefile.am +++ b/gst-libs/gst/gl/win32/Makefile.am @@ -20,7 +20,6 @@ endif libgstgl_win32_la_CFLAGS = \ -I$(top_srcdir)/gst-libs \ $(GL_CFLAGS) \ - $(X_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) diff --git a/gst-libs/gst/gl/x11/Makefile.am b/gst-libs/gst/gl/x11/Makefile.am index fa96598ca1..9626d84825 100644 --- a/gst-libs/gst/gl/x11/Makefile.am +++ b/gst-libs/gst/gl/x11/Makefile.am @@ -28,7 +28,6 @@ endif libgstgl_x11_la_CFLAGS = \ -I$(top_srcdir)/gst-libs \ $(GL_CFLAGS) \ - $(X_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS)