Gutsy oopses on touch of existing file. Workaround.

diff --git a/Makefile b/Makefile
index 9a6557571c5029cf477ad2e9d44b41ff46d1cabf..4bd340f21208f934f62a9bcdb34dbd98b78ca5c7 100644 (file)
--- 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 0a0c77906f7f82f36d4b17e35128cf33964b6dfd..178020e2b3fa3f290fa9eb03c7279dcc50282f29 100644 (file)
--- 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 7f1e162186f9575ab6fc36b962fec521a130cf51..cc27024b568c94319fc54bbaaac9befd2c7caf36 100644 (file)
--- 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 cb11971c640de7f2b5de228772ca1f8495546866..fa3720a16ba8c0e7e9edf37535f3dee4530ec968 100644 (file)
--- 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 431eda4197ff3e03113f01263c6889eaccf8825c..e6844d48524d2de28aa628cbb39170368b5b049e 100644 (file)
--- 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 3ff928bfd721e4c51e5e2ec6fac5acb7325d4f87..a7ba512cb11c57d8e07de44519a0cbccb50cd791 100644 (file)
--- 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 3791b16df89499f3b74df1192a45eadd24293df5..e881b8aacdda6bc27b15a16962f5d48e3bd40529 100644 (file)
--- 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 254ff8c098fdd1edd42d906283b661dd31a80627..b32b4141e8d306eb67e572e4d60af04e34539cd8 100644 (file)
--- 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 1bef6c23a35223041ce6205f8690039ebee73bc2..748c83c2286186f2b297665222929791269dc481 100644 (file)
--- 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 7e1d56b3278271d70ee91d18ea83b7fd936271e3..910c6fa28a4adcf926d1c2357b2aa74d6ee8556e 100644 (file)
--- 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 177bfe2d2bfd70833beccbbd8dfeddc7cde7df30..980306d0e28d041b4a6cc3a4a0eeffe9cd8f5330 100644 (file)
--- 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 5228cbbb7219c5a07e647eece23108f5061bb50c..12ab2facd4828df1f97e9007dc2b79a7615cb893 100644 (file)
--- 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 71f085d5cd96534edd2195912a269b259a5f8619..9545505cbff6b2b0d4dbf4d5e1efd31409f87b6f 100644 (file)
--- 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 296747e0dda2fdd9994ec30c80516faecf230899..c7b5874faa7dbf33498805fbf0460208e52eb5a5 100644 (file)
--- 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 1897d6aa3e822b74d9f3335448fb6654ddfa8db4..f8b7eb69a4ef70b667234edd9b9c5d678c49426a 100644 (file)
--- 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 00b09613ec2959365920b51942397630212eaa3e..37bf0a49772efd25f99e1ad2ec4a751ab6a1eb39 100644 (file)
--- 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 a9e96970fae1ce954144a25ff52b6edd8fa3e500..ac7e1de92857f460c548ef60294c83b2730ef496 100644 (file)
--- 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