Fix build with alternate X11, GLX and EGL prefixes.

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>

diff --git a/va/egl/Makefile.am b/va/egl/Makefile.am
index 7de0967..52e7dc1 100644 (file)
--- a/va/egl/Makefile.am
+++ b/va/egl/Makefile.am
@@ -20,7 +20,12 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-INCLUDES = -DLINUX -I$(top_srcdir) -I$(top_srcdir)/va $(EGL_DEPS_CFLAGS)
+INCLUDES = \
+       -DLINUX                 \
+       -I$(top_srcdir)         \
+       -I$(top_srcdir)/va      \
+       $(EGL_DEPS_CFLAGS)      \
+       $(NULL)
 
 source_c = \
        va_egl.c                \

diff --git a/va/glx/Makefile.am b/va/glx/Makefile.am
index 05cfbce..19f2cf5 100644 (file)
--- a/va/glx/Makefile.am
+++ b/va/glx/Makefile.am
@@ -20,7 +20,14 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-INCLUDES = -DLINUX -I$(top_srcdir) -I$(top_srcdir)/va -I$(top_srcdir)/va/x11
+INCLUDES = \
+       -DLINUX                 \
+       -I$(top_srcdir)         \
+       -I$(top_srcdir)/va      \
+       -I$(top_srcdir)/va/x11  \
+       $(X11_CFLAGS)           \
+       $(GL_DEPS_CFLAGS)       \
+       $(NULL)
 
 source_c = \
        va_glx.c                \

diff --git a/va/x11/Makefile.am b/va/x11/Makefile.am
index fc20f02..8bcc284 100644 (file)
--- a/va/x11/Makefile.am
+++ b/va/x11/Makefile.am
@@ -20,7 +20,13 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-INCLUDES = -DLINUX -I$(top_srcdir) -I$(top_srcdir)/va $(DRM_CFLAGS)
+INCLUDES = \
+       -DLINUX                 \
+       -I$(top_srcdir)         \
+       -I$(top_srcdir)/va      \
+       $(X11_CFLAGS)           \
+       $(DRM_CFLAGS)           \
+       $(NULL)
 
 source_c = \
        dri2_util.c             \