summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/xorg
diff options
context:
space:
mode:
authorGeorge Sapountzis <gsap7@yahoo.gr>2008-04-26 12:34:11 +0300
committerGeorge Sapountzis <gsap7@yahoo.gr>2008-05-05 18:14:52 +0300
commit2ed0f7278e389ecc0cf568518799a9a8f33b1365 (patch)
tree6da3d05a379c49854ca477a49bda9fe415302bcf /src/mesa/drivers/xorg
parent2fa2dd3908c783663ca421134cde82e9b6a38a0d (diff)
glcore: Set all external variables in configuration
based on patch by Dan Nicholson <dbn.lists@gmail.com>
Diffstat (limited to 'src/mesa/drivers/xorg')
-rw-r--r--src/mesa/drivers/xorg/Makefile8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/xorg/Makefile b/src/mesa/drivers/xorg/Makefile
index a1b417447b..437bdf0ce6 100644
--- a/src/mesa/drivers/xorg/Makefile
+++ b/src/mesa/drivers/xorg/Makefile
@@ -32,7 +32,7 @@ C_SOURCES = \
MESA_MODULES = $(TOP)/src/mesa/libmesa.a
C_SOURCES += ../common/driverfuncs.c
-ifeq ("${DRIVER_DIRS}", "dri")
+ifeq ($(WINDOW_SYSTEM),dri)
C_SOURCES += ../dri/common/utils.c
endif
@@ -46,12 +46,12 @@ INCLUDES = \
-I$(TOP)/src/mesa \
-I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
- `pkg-config --cflags xorg-server`
+ $(XORG_CFLAGS)
-ifeq ("${DRIVER_DIRS}", "dri")
+ifeq ($(WINDOW_SYSTEM),dri)
INCLUDES += \
-I$(TOP)/src/mesa/drivers/dri/common \
- `pkg-config --cflags libdrm`
+ $(LIBDRM_CFLAGS)
endif
# undef 'USE_XSHM' to make it explicit that 'XFree86Server' takes precedence