From fc236723273d4d872ae5e7cac876ea20175df10d Mon Sep 17 00:00:00 2001
From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 8 Dec 2004 15:16:36 +0000
Subject: Improve the behaviour of the build system wrt depend files.

	- Remove the -Y option for makedepend, so that the standard
	  directories are searched
	- No longer pipe the multiple errors that the -Y option caused
	  into /dev/null -- we want to know about these failures.
	- Fix up a few other misc makedepend failures.
---
 src/glx/x11/Makefile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/glx/x11/Makefile')

diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 2ef1b966fd..a8fe53a62c 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -55,9 +55,7 @@ X86_SOURCES = $(TOP)/src/mesa/x86/glapi_x86.S
 OBJECTS = $(C_SOURCES:.c=.o) \
 	  $(ASM_SOURCES:.S=.o)
 
-INCLUDES = -I. $(INCLUDE_DIRS)
-
-INCLUDE_DIRS = \
+INCLUDES = -I. \
 	-I$(TOP)/include \
 	-I$(TOP)/include/GL/internal \
 	-I$(TOP)/src/mesa \
@@ -69,7 +67,8 @@ INCLUDE_DIRS = \
 	-I$(TOP)/src/mesa/swrast_setup \
 	-I$(TOP)/src/mesa/drivers/dri/common \
 	-I$(DRM_SOURCE_PATH)/libdrm \
-	-I$(DRM_SOURCE_PATH)/shared
+	-I$(DRM_SOURCE_PATH)/shared \
+	$(X11_INCLUDES)
 
 
 ##### RULES #####
@@ -100,7 +99,7 @@ drmtest: xf86drm.o drmtest.o
 depend: $(C_SOURCES) $(ASM_SOURCES)
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \
-		> /dev/null 2>&1
+		> /dev/null 
 
 
 # Emacs tags
-- 
cgit v1.2.3