improved 'clean' targets (Otto Solares)

8 files changed, 16 insertions, 14 deletions

diff --git a/src/glu/mesa/Makefile.X11 b/src/glu/mesa/Makefile.X11
index b50db58c36..2265620fe6 100644
--- a/src/glu/mesa/Makefile.X11
+++ b/src/glu/mesa/Makefile.X11
@@ -34,7 +34,7 @@ default:
 	@echo "Specify a target configuration"
 
 clean:
-	-rm *.o *~
+	-rm -f *.o *~
 
 targets: $(LIBDIR)/$(GLU_LIB)
 
diff --git a/src/glu/mini/Makefile.X11 b/src/glu/mini/Makefile.X11
index d0ef2e50f0..4462d56261 100644
--- a/src/glu/mini/Makefile.X11
+++ b/src/glu/mini/Makefile.X11
@@ -39,7 +39,7 @@ targets: depend libGLU.so.1.1 install
 libGLU.so.1.1: $(OBJS) Makefile.X11
 	gcc -shared -Wl,-soname,libGLU.so -Wl,-Bsymbolic $(OBJS) $(LIBS) -o $@ 
 
-install:
+install: libGLU.so.1.1
 	rm -f $(TOP)/lib/libGLU.so*
 	install -D libGLU.so.1.1 $(TOP)/lib/libGLU.so.1.1
 	ln -s libGLU.so.1.1 $(TOP)/lib/libGLU.so.1
@@ -58,7 +58,7 @@ tags:
 
 # Remove .o and backup files
 clean:
-	-rm -f *.o *~ *.o *~ *.so
+	-rm -f *.o *~ *.o *~ *.so libGLU.so.1.1
 
 include $(TOP)/Make-config
 
diff --git a/src/glu/sgi/Makefile.X11 b/src/glu/sgi/Makefile.X11
index 76befaa0fa..7202aa84ff 100644
--- a/src/glu/sgi/Makefile.X11
+++ b/src/glu/sgi/Makefile.X11
@@ -131,9 +131,9 @@ default:
 	@echo "Specify a target configuration"
 
 clean:
-	-rm *.o */*.o */*/*.o
-	-rm *.lo */*.lo */*/*.lo
-	-rm *.la */*.la */*/*.la
+	-rm -f *.o */*.o */*/*.o
+	-rm -f *.lo */*.lo */*/*.lo
+	-rm -f *.la */*.la */*/*.la
 
 
 targets: $(LIBDIR)/$(GLU_LIB)
diff --git a/src/glut/mini/Makefile.X11 b/src/glut/mini/Makefile.X11
index 097a665e4e..bbdc6a690c 100644
--- a/src/glut/mini/Makefile.X11
+++ b/src/glut/mini/Makefile.X11
@@ -52,7 +52,7 @@ targets: depend libglut.so.3.7 install
 libglut.so.3.7: $(OBJS) Makefile.X11
 	gcc -shared -Wl,-soname,libglut.so -Wl,-Bsymbolic $(OBJS) $(LIBS) -o $@ 
 
-install:
+install: libglut.so.3.7
 	rm -f $(TOP)/lib/libglut.so*
 	install -D libglut.so.3.7 $(TOP)/lib/libglut.so.3.7
 	ln -s libglut.so.3.7 $(TOP)/lib/libglut.so.3
@@ -70,8 +70,8 @@ tags:
 
 
 # Remove .o and backup files
-clean:
-	-rm -f *.o *~ *.o *~ *.so
+clean: depend
+	-rm -f *.o *~ *.o *~ *.so libglut.so.3.7
 
 include $(TOP)/Make-config
 
diff --git a/src/glw/Makefile.X11 b/src/glw/Makefile.X11
index 90b7f9d35f..888aebd52c 100644
--- a/src/glw/Makefile.X11
+++ b/src/glw/Makefile.X11
@@ -38,7 +38,7 @@ default:
 	@echo "Specify a target configuration"
 
 clean:
-	-rm *.o *~
+	-rm -f *.o *~
 
 targets: $(LIBDIR)/$(GLW_LIB) message
 
diff --git a/src/glx/mini/Makefile.X11 b/src/glx/mini/Makefile.X11
index 2e818f0b01..115854393a 100644
--- a/src/glx/mini/Makefile.X11
+++ b/src/glx/mini/Makefile.X11
@@ -71,7 +71,8 @@ tags:
 # Remove .o and backup files
 clean:
 	-rm -f drmtest $(TOP)/lib/libGL.so*
-	-rm -f */*.o */*~ */*.o */*~
+	-rm -f libGL.so*
+	-rm -f *.o *~
 
 
 include $(TOP)/Make-config
diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index 12790a56b7..373608a325 100644
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -348,9 +348,9 @@ tags:
 
 # Remove .o and backup files
 clean:
-	-rm *.a
+	-rm -f *.a
 	-rm -f */*.o */*~ */*.o */*~
-	-rm -f drivers/*/*.o
+	-rm -f drivers/*/*.o drivers/*/*/*.o
 
 
 include $(TOP)/Make-config
diff --git a/src/mesa/drivers/dri/r200/Makefile.X11 b/src/mesa/drivers/dri/r200/Makefile.X11
index 2c73f4d521..62f4b4b94c 100644
--- a/src/mesa/drivers/dri/r200/Makefile.X11
+++ b/src/mesa/drivers/dri/r200/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.3 2003/09/30 10:29:15 alanh Exp $
+# $Id: Makefile.X11,v 1.4 2003/10/03 14:03:18 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.0
@@ -133,6 +133,7 @@ tags:
 # Remove .o and backup files
 clean:
 	-rm -f *.o */*.o *~ *.o *~ *.so server/*.o
+	-rm -f $(SYMLINKS)
 
 
 include $(TOP)/Make-config