From: Dan Nicholson <dbn.lists@gmail.com>
Date: Tue, 6 May 2008 21:00:43 +0000 (-0700)
Subject: Always cleanup the makedepend backup files
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c5e2b850ad53fcd1af62c838f8ee288e8ea9fb3d;p=mesa.git

Always cleanup the makedepend backup files

Consistently cleanup the depend.bak files created by makedepend. Also,
realclean has been changed to use a single find command, which speeds it
up considerably.
---

diff --git a/Makefile b/Makefile
index 62ec0709796..c69dfcec796 100644
--- a/Makefile
+++ b/Makefile
@@ -31,10 +31,8 @@ realclean:
 	-rm -f $(TOP)/configs/current
 	-rm -f $(TOP)/configs/autoconf
 	-rm -rf autom4te.cache
-	-rm -f `find . -name \*.o`
-	-rm -f `find . -name \*.a`
-	-rm -f `find . -name \*.so`
-	-rm -f `find . -name depend`
+	-find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
+	  -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
 
 
 
diff --git a/src/glut/directfb/Makefile b/src/glut/directfb/Makefile
index aa77db91c6c..36b0ea34ed5 100644
--- a/src/glut/directfb/Makefile
+++ b/src/glut/directfb/Makefile
@@ -80,7 +80,7 @@ tags:
 
 # Remove .o and backup files
 clean: depend
-	-rm -f depend
+	-rm -f depend depend.bak
 	-rm -f *.o *~ *.o *~ *.so libglut.so.3.7
 
 include depend
diff --git a/src/glut/fbdev/Makefile b/src/glut/fbdev/Makefile
index 948be0c7ba3..95893b7dd1b 100644
--- a/src/glut/fbdev/Makefile
+++ b/src/glut/fbdev/Makefile
@@ -87,7 +87,7 @@ tags:
 
 # Remove .o and backup files
 clean: depend
-	-rm -f depend
+	-rm -f depend depend.bak
 	-rm -f *.o *~ *.o *~ *.so libglut.so.3.7
 
 include depend
diff --git a/src/glut/glx/Makefile b/src/glut/glx/Makefile
index 46185cebbc0..674d5a5dcef 100644
--- a/src/glut/glx/Makefile
+++ b/src/glut/glx/Makefile
@@ -119,7 +119,7 @@ clean:
 	-rm -f *.lo
 	-rm -f *.la
 	-rm -rf .libs
-	-rm -rf depend depend.bak
+	-rm -f depend depend.bak
 
 
 depend: $(SOURCES)
diff --git a/src/glut/mini/Makefile b/src/glut/mini/Makefile
index a73198a68cc..d3860503901 100644
--- a/src/glut/mini/Makefile
+++ b/src/glut/mini/Makefile
@@ -91,7 +91,7 @@ install: glut.pc
 
 # Remove .o and backup files
 clean: depend
-	-rm -f depend
+	-rm -f depend depend.bak
 	-rm -f *.o *~ *.o *~ *.so libglut.so.3.7
 
 include depend
diff --git a/src/glw/Makefile b/src/glw/Makefile
index ce6a30e9de3..88bf99d44f3 100644
--- a/src/glw/Makefile
+++ b/src/glw/Makefile
@@ -42,7 +42,7 @@ install: glw.pc
 	$(INSTALL) -m 644 glw.pc $(DESTDIR)$(INSTALL_DIR)/$(LIB_DIR)/pkgconfig
 
 clean:
-	-rm depend depend.bak
+	-rm -f depend depend.bak
 	-rm -f *.o *~
 
 
diff --git a/src/glx/mini/Makefile b/src/glx/mini/Makefile
index 7ed2146d562..69c3d683e8c 100644
--- a/src/glx/mini/Makefile
+++ b/src/glx/mini/Makefile
@@ -83,6 +83,6 @@ install:
 clean:
 	-rm -f drmtest $(TOP)/$(LIB_DIR)/libGL.so*
 	-rm -f *.o *~
-	-rm -f depend
+	-rm -f depend depend.bak
 
 include depend
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index f12d1f70dc8..1d6bb2f1c95 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -91,6 +91,6 @@ install: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
 clean:
 	-rm -f $(TOP)/$(LIB_DIR)/libGL.so*
 	-rm -f *.o *~
-	-rm -f depend
+	-rm -f depend depend.bak
 
 -include depend
diff --git a/src/mesa/drivers/beos/Makefile b/src/mesa/drivers/beos/Makefile
index 07d3d344f17..0448650a8c6 100644
--- a/src/mesa/drivers/beos/Makefile
+++ b/src/mesa/drivers/beos/Makefile
@@ -191,6 +191,6 @@ depend: $(DRIVER_SOURCES) $(GLU_SOURCES)
 	$(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(DRIVER_SOURCES) $(GLU_SOURCES) > /dev/null 
 
 clean:
-	rm -f depend $(OBJECTS)
+	-rm -f depend depend.bak $(OBJECTS)
 
 include depend