summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKristian Høgsberg <krh@redhat.com>2008-02-25 18:50:26 -0500
committerKristian Høgsberg <krh@redhat.com>2008-02-25 19:02:07 -0500
commitbcecea6ea6c2727e4071f5a43fab49673573e905 (patch)
treeccee9ba7972f3a260976e967a9f15cedb76846e1 /src
parent7381ccab449c65d843580f76426f87ab6b1649ce (diff)
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.
Diffstat (limited to 'src')
-rw-r--r--src/glx/x11/Makefile2
-rw-r--r--src/mesa/Makefile2
-rw-r--r--src/mesa/drivers/dri/Makefile.template4
3 files changed, 4 insertions, 4 deletions
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 00a568cdbc..3366f005eb 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -89,4 +89,4 @@ clean:
-rm -f *.o *~
-rm -f depend
-include depend
+-include depend
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