From bcecea6ea6c2727e4071f5a43fab49673573e905 Mon Sep 17 00:00:00 2001
From: Kristian Høgsberg <krh@redhat.com>
Date: Mon, 25 Feb 2008 18:50:26 -0500
Subject: autoconf: Add gcc search patch to MKDEP_OPTIONS to eliminate
 warnings.

Also, use -include to avoid error message when make initially fails to
include the non-existent depend file.
---
 src/mesa/Makefile                      | 2 +-
 src/mesa/drivers/dri/Makefile.template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/mesa')

diff --git a/src/mesa/Makefile b/src/mesa/Makefile
index 02e0054479..d0c78b71ee 100644
--- a/src/mesa/Makefile
+++ b/src/mesa/Makefile
@@ -197,4 +197,4 @@ clean:
 	(cd x86-64 && $(MAKE) clean)
 
 
-include depend
+-include depend
diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index ad0a9c33f8..53f9d80689 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -80,7 +80,7 @@ $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
 depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
-		$(ASM_SOURCES) 2>&1 /dev/null
+		$(ASM_SOURCES)
 
 
 # Emacs tags
@@ -99,4 +99,4 @@ install: $(LIBNAME)
 	$(INSTALL) -m 755 $(LIBNAME) $(DESTDIR)$(DRI_DRIVER_INSTALL_DIR)
 
 
-include depend
+-include depend
-- 
cgit v1.2.3