From de4ee20578a79e024b0de83c40648112f42c994e Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Sat, 13 Mar 2010 11:56:59 -0800 Subject: gallium: Respect user's CFLAGS for including X headers This can break on systems that don't have a system X installation. Signed-off-by: Dan Nicholson --- src/gallium/state_trackers/glx/xlib/Makefile | 3 ++- src/gallium/winsys/xlib/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gallium/state_trackers/glx/xlib/Makefile b/src/gallium/state_trackers/glx/xlib/Makefile index 7b2adc62c3..8c7cc524df 100644 --- a/src/gallium/state_trackers/glx/xlib/Makefile +++ b/src/gallium/state_trackers/glx/xlib/Makefile @@ -5,7 +5,8 @@ LIBNAME = xlib LIBRARY_INCLUDES = \ -I$(TOP)/include \ - -I$(TOP)/src/mesa + -I$(TOP)/src/mesa \ + $(X_CFLAGS) C_SOURCES = \ glx_api.c \ diff --git a/src/gallium/winsys/xlib/Makefile b/src/gallium/winsys/xlib/Makefile index 68542b488d..18357a4112 100644 --- a/src/gallium/winsys/xlib/Makefile +++ b/src/gallium/winsys/xlib/Makefile @@ -6,7 +6,8 @@ LIBNAME = ws_xlib LIBRARY_INCLUDES = \ -I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/drivers \ - -I$(TOP)/src/gallium/auxiliary + -I$(TOP)/src/gallium/auxiliary \ + $(X_CFLAGS) C_SOURCES = \ xlib_sw_winsys.c -- cgit v1.2.3