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 62ec0709796f72d70116c68c2943bbeb7fda6b71..c69dfcec7961e39b772de480cb5d1355a9d17eff 100644 (file)
--- 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 aa77db91c6c4d8dbfa66e133e7f97792beefdfdf..36b0ea34ed5fdb3be4608fb498545f4610f1acb3 100644 (file)
--- 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 948be0c7ba384cd943d68c10c875b287f9639d01..95893b7dd1be3dcecc973dc13055a9a43d347055 100644 (file)
--- 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 46185cebbc0f7264747c2035deb9bce7fc6d36b8..674d5a5dcefe728bf8991f2fecd55c3d975650a0 100644 (file)
--- 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 a73198a68ccdf51e8d027adcf1f6d33600f64820..d3860503901ca745c86756aeda598b8e045ba54b 100644 (file)
--- 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 ce6a30e9de35ff7721413a89bf6799019a98a001..88bf99d44f3811c77ee0c3af481257f1a7236dfe 100644 (file)
--- 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 7ed2146d562607a4379ff7a1626ce35e806431fc..69c3d683e8c3570ff6608abcffc9051e21088272 100644 (file)
--- 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 f12d1f70dc8e176ac9b8506d4f2a8d8cdd1e6c89..1d6bb2f1c95e86963030861d7d6ee5846469396e 100644 (file)
--- 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 07d3d344f17a22a429795b542660b9aa2c547e83..0448650a8c672f8077ae049a473e3205ae7d9727 100644 (file)
--- 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