Gutsy oopses on touch of existing file. Workaround.

17 files changed, 19 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 9a6557571c5..4bd340f2120 100644
--- a/Makefile
+++ b/Makefile
@@ -25,15 +25,13 @@ clean:
 
 
 realclean:
-	touch $(TOP)/configs/current
-	$(MAKE) clean
-	-rm -rf lib*
-	-rm -f $(TOP)/configs/current
 	-rm -f `find . -name \*.o`
 	-rm -f `find . -name \*.a`
 	-rm -f `find . -name \*.so`
 	-rm -f `find . -name depend`
-
+	-rm -rf lib*
+	$(MAKE) clean
+	-rm -f $(TOP)/configs/current
 
 
 install:
diff --git a/progs/fbdev/Makefile b/progs/fbdev/Makefile
index 0a0c77906f7..178020e2b3f 100644
--- a/progs/fbdev/Makefile
+++ b/progs/fbdev/Makefile
@@ -41,6 +41,7 @@ clean:
 
 
 depend: $(SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
diff --git a/progs/miniglx/Makefile b/progs/miniglx/Makefile
index 7f1e162186f..cc27024b568 100644
--- a/progs/miniglx/Makefile
+++ b/progs/miniglx/Makefile
@@ -46,6 +46,7 @@ clean:
 
 
 depend: $(SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
diff --git a/src/egl/drivers/dri/Makefile b/src/egl/drivers/dri/Makefile
index cb11971c640..fa3720a16ba 100644
--- a/src/egl/drivers/dri/Makefile
+++ b/src/egl/drivers/dri/Makefile
@@ -52,6 +52,7 @@ clean:
 
 depend: $(SOURCES) $(HEADERS)
 	@ echo "running $(MKDEP)"
+	@ rm -f depend
 	@ touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) \
 		$(SOURCES) $(HEADERS) > /dev/null 
diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 431eda4197f..e6844d48524 100644
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -58,6 +58,7 @@ clean:
 
 depend: $(SOURCES) $(HEADERS)
 	@ echo "running $(MKDEP)"
+	@ rm -f depend
 	@ touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) \
 		$(SOURCES) $(HEADERS) > /dev/null 
diff --git a/src/glut/beos/Makefile b/src/glut/beos/Makefile
index 3ff928bfd72..a7ba512cb11 100644
--- a/src/glut/beos/Makefile
+++ b/src/glut/beos/Makefile
@@ -91,6 +91,7 @@ clean:
 	-rm -f *.o
 
 depend: $(SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
diff --git a/src/glut/directfb/Makefile b/src/glut/directfb/Makefile
index 3791b16df89..e881b8aacdd 100644
--- a/src/glut/directfb/Makefile
+++ b/src/glut/directfb/Makefile
@@ -70,6 +70,7 @@ $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
 # Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(SOURCES) 
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
diff --git a/src/glut/fbdev/Makefile b/src/glut/fbdev/Makefile
index 254ff8c098f..b32b4141e8d 100644
--- a/src/glut/fbdev/Makefile
+++ b/src/glut/fbdev/Makefile
@@ -77,6 +77,7 @@ install:
 # Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(SOURCES) 
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
diff --git a/src/glut/ggi/Makefile b/src/glut/ggi/Makefile
index 1bef6c23a35..748c83c2286 100644
--- a/src/glut/ggi/Makefile
+++ b/src/glut/ggi/Makefile
@@ -46,6 +46,7 @@ clean:
 
 
 depend: $(SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES)
 
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 7e1d56b3278..910c6fa28a4 100644
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -113,6 +113,7 @@ clean:
 
 depend: $(SOURCES)
 	@ echo "running $(MKDEP)"
+	@ rm -f depend
 	@ touch depend
 	@ $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES) \
 		> /dev/null 
diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile
index 177bfe2d2bf..980306d0e28 100644
--- a/src/glut/mini/Makefile
+++ b/src/glut/mini/Makefile
@@ -64,6 +64,7 @@ $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS)
 # Run 'make -f Makefile.solo dep' to update the dependencies if you change
 # what's included by any source file.
 depend: $(SOURCES) 
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null 
 
diff --git a/src/glw/Makefile b/src/glw/Makefile
index 5228cbbb721..12ab2facd48 100644
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -49,6 +49,7 @@ $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
 # by any source file.
 # 
 depend: $(GLW_SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(GLW_SOURCES) \
 		> /dev/null 
diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index 71f085d5cd9..9545505cbff 100644
--- a/src/glx/mini/Makefile
+++ b/src/glx/mini/Makefile
@@ -65,6 +65,7 @@ drmtest: xf86drm.o drmtest.o
 
 
 depend: $(C_SOURCES) $(ASM_SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \
 		> /dev/null 
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 296747e0dda..c7b5874faa7 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -70,6 +70,7 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME):  $(OBJECTS) Makefile
 
 
 depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) \
 		$(MESA_GLAPI_SOURCES) $(MESA_ASM_API) 
diff --git a/src/mesa/drivers/beos/Makefile b/src/mesa/drivers/beos/Makefile
index 1897d6aa3e8..f8b7eb69a4e 100644
--- a/src/mesa/drivers/beos/Makefile
+++ b/src/mesa/drivers/beos/Makefile
@@ -186,6 +186,7 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES)
 #	cd $(GLU_DIR); $(MAKE) $< ;
 
 depend: $(DRIVER_SOURCES) $(GLU_SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(DRIVER_SOURCES) $(GLU_SOURCES) > /dev/null 
 
diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template
index 00b09613ec2..37bf0a49772 100644
--- a/src/mesa/drivers/dri/Makefile.template
+++ b/src/mesa/drivers/dri/Makefile.template
@@ -83,6 +83,7 @@ $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
 
 
 depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
 		$(ASM_SOURCES) 2> /dev/null
diff --git a/src/mesa/drivers/dri/glcore/Makefile b/src/mesa/drivers/dri/glcore/Makefile
index a9e96970fae..ac7e1de9285 100644
--- a/src/mesa/drivers/dri/glcore/Makefile
+++ b/src/mesa/drivers/dri/glcore/Makefile
@@ -66,6 +66,7 @@ $(TOP)/$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
 
 
 depend: $(C_SOURCES) $(ASM_SOURCES)
+	rm -f depend
 	touch depend
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \
 		> /dev/null