summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicholson <dbn.lists@gmail.com>2010-03-13 11:56:59 -0800
committerDan Nicholson <dbn.lists@gmail.com>2010-03-13 11:56:59 -0800
commitde4ee20578a79e024b0de83c40648112f42c994e (patch)
tree1f8b4f97ed3e80a01f2b8c8662bfb808a3d93493
parent8d86d395dcf6a5f192b6987485bb7aef49f1fefc (diff)
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 <dbn.lists@gmail.com>
-rw-r--r--src/gallium/state_trackers/glx/xlib/Makefile3
-rw-r--r--src/gallium/winsys/xlib/Makefile3
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 7b2adc62c34..8c7cc524dfc 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 68542b488df..18357a41127 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