Commit 90ee7a41 authored by Keith Whitwell's avatar Keith Whitwell

Gutsy oopses on touch of existing file. Workaround.

parent 87a8f564
...@@ -25,15 +25,13 @@ clean: ...@@ -25,15 +25,13 @@ clean:
realclean: realclean:
touch $(TOP)/configs/current
$(MAKE) clean
-rm -rf lib*
-rm -f $(TOP)/configs/current
-rm -f `find . -name \*.o` -rm -f `find . -name \*.o`
-rm -f `find . -name \*.a` -rm -f `find . -name \*.a`
-rm -f `find . -name \*.so` -rm -f `find . -name \*.so`
-rm -f `find . -name depend` -rm -f `find . -name depend`
-rm -rf lib*
$(MAKE) clean
-rm -f $(TOP)/configs/current
install: install:
......
...@@ -41,6 +41,7 @@ clean: ...@@ -41,6 +41,7 @@ clean:
depend: $(SOURCES) depend: $(SOURCES)
rm -f depend
touch depend touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null
......
...@@ -46,6 +46,7 @@ clean: ...@@ -46,6 +46,7 @@ clean:
depend: $(SOURCES) depend: $(SOURCES)
rm -f depend
touch depend touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null
......
...@@ -52,6 +52,7 @@ clean: ...@@ -52,6 +52,7 @@ clean:
depend: $(SOURCES) $(HEADERS) depend: $(SOURCES) $(HEADERS)
@ echo "running $(MKDEP)" @ echo "running $(MKDEP)"
@ rm -f depend
@ touch depend @ touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) \ $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) \
$(SOURCES) $(HEADERS) > /dev/null $(SOURCES) $(HEADERS) > /dev/null
......
...@@ -58,6 +58,7 @@ clean: ...@@ -58,6 +58,7 @@ clean:
depend: $(SOURCES) $(HEADERS) depend: $(SOURCES) $(HEADERS)
@ echo "running $(MKDEP)" @ echo "running $(MKDEP)"
@ rm -f depend
@ touch depend @ touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) \ $(MKDEP) $(MKDEP_OPTIONS) $(DEFINES) $(INCLUDE_DIRS) \
$(SOURCES) $(HEADERS) > /dev/null $(SOURCES) $(HEADERS) > /dev/null
......
...@@ -91,6 +91,7 @@ clean: ...@@ -91,6 +91,7 @@ clean:
-rm -f *.o -rm -f *.o
depend: $(SOURCES) depend: $(SOURCES)
rm -f depend
touch depend touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null
......
...@@ -70,6 +70,7 @@ $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) ...@@ -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 # Run 'make -f Makefile.solo dep' to update the dependencies if you change
# what's included by any source file. # what's included by any source file.
depend: $(SOURCES) depend: $(SOURCES)
rm -f depend
touch depend touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null
......
...@@ -77,6 +77,7 @@ install: ...@@ -77,6 +77,7 @@ install:
# Run 'make -f Makefile.solo dep' to update the dependencies if you change # Run 'make -f Makefile.solo dep' to update the dependencies if you change
# what's included by any source file. # what's included by any source file.
depend: $(SOURCES) depend: $(SOURCES)
rm -f depend
touch depend touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null
......
...@@ -46,6 +46,7 @@ clean: ...@@ -46,6 +46,7 @@ clean:
depend: $(SOURCES) depend: $(SOURCES)
rm -f depend
touch depend touch depend
$(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES) $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES)
......
...@@ -113,6 +113,7 @@ clean: ...@@ -113,6 +113,7 @@ clean:
depend: $(SOURCES) depend: $(SOURCES)
@ echo "running $(MKDEP)" @ echo "running $(MKDEP)"
@ rm -f depend
@ touch depend @ touch depend
@ $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES) \ @ $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(SOURCES) \
> /dev/null > /dev/null
......
...@@ -64,6 +64,7 @@ $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME): depend $(OBJECTS) ...@@ -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 # Run 'make -f Makefile.solo dep' to update the dependencies if you change
# what's included by any source file. # what's included by any source file.
depend: $(SOURCES) depend: $(SOURCES)
rm -f depend
touch depend touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) > /dev/null
......
...@@ -49,6 +49,7 @@ $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS) ...@@ -49,6 +49,7 @@ $(TOP)/$(LIB_DIR)/$(GLW_LIB_NAME): $(OBJECTS)
# by any source file. # by any source file.
# #
depend: $(GLW_SOURCES) depend: $(GLW_SOURCES)
rm -f depend
touch depend touch depend
$(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(GLW_SOURCES) \ $(MKDEP) $(MKDEP_OPTIONS) -I$(TOP)/include $(GLW_SOURCES) \
> /dev/null > /dev/null
......
...@@ -65,6 +65,7 @@ drmtest: xf86drm.o drmtest.o ...@@ -65,6 +65,7 @@ drmtest: xf86drm.o drmtest.o
depend: $(C_SOURCES) $(ASM_SOURCES) depend: $(C_SOURCES) $(ASM_SOURCES)
rm -f depend
touch depend touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \ $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES) \
> /dev/null > /dev/null
......
...@@ -70,6 +70,7 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile ...@@ -70,6 +70,7 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile
depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API) Makefile
rm -f depend
touch depend touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) \ $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(SOURCES) \
$(MESA_GLAPI_SOURCES) $(MESA_ASM_API) $(MESA_GLAPI_SOURCES) $(MESA_ASM_API)
......
...@@ -186,6 +186,7 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES) ...@@ -186,6 +186,7 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(MESA_MODULES) $(GLU_MODULES)
# cd $(GLU_DIR); $(MAKE) $< ; # cd $(GLU_DIR); $(MAKE) $< ;
depend: $(DRIVER_SOURCES) $(GLU_SOURCES) depend: $(DRIVER_SOURCES) $(GLU_SOURCES)
rm -f depend
touch depend touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(DRIVER_SOURCES) $(GLU_SOURCES) > /dev/null $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(DRIVER_SOURCES) $(GLU_SOURCES) > /dev/null
......
...@@ -83,6 +83,7 @@ $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME) ...@@ -83,6 +83,7 @@ $(TOP)/$(LIB_DIR)/$(LIBNAME): $(LIBNAME)
depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS) depend: $(C_SOURCES) $(ASM_SOURCES) $(SYMLINKS)
rm -f depend
touch depend touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \ $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) \
$(ASM_SOURCES) 2> /dev/null $(ASM_SOURCES) 2> /dev/null
......
...@@ -66,6 +66,7 @@ $(TOP)/$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile ...@@ -66,6 +66,7 @@ $(TOP)/$(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
depend: $(C_SOURCES) $(ASM_SOURCES) depend: $(C_SOURCES) $(ASM_SOURCES)
rm -f depend
touch depend touch depend
$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \ $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \
> /dev/null > /dev/null
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment