improved 'clean' targets (Otto Solares)

13 files changed, 77 insertions, 45 deletions

diff --git a/Makefile.X11 b/Makefile.X11
index 94455301980..39fae1ccffb 100644
--- a/Makefile.X11
+++ b/Makefile.X11
@@ -1,4 +1,4 @@
-# $Id: Makefile.X11,v 1.89 2003/09/30 11:28:16 alanh Exp $
+# $Id: Makefile.X11,v 1.90 2003/10/03 14:03:14 brianp Exp $
 
 # Mesa 3-D graphics library
 # Version:  5.1
@@ -269,24 +269,54 @@ linux-solo:
 
 # Remove .o files, emacs backup files, etc.
 clean:
-	-rm -f src/mesa/*/*.o
-	-rm -f src/mesa/drivers/*/*.o
-	-rm -f src/mesa/drivers/*/*/*.o
-	-rm -f src/mesa/drivers/*/*/*/*.o
-	-rm -f include/*~
+	if ! [ -f src/mesa/depend      ] ; then touch src/mesa/depend      ; fi
+	if ! [ -f src/mesa/drivers/dri/r200/depend ];   then touch src/mesa/drivers/dri/r200/depend;   fi
+	if ! [ -f src/mesa/drivers/dri/r128/depend ];   then touch src/mesa/drivers/dri/r128/depend;   fi
+	if ! [ -f src/mesa/drivers/dri/radeon/depend ]; then touch src/mesa/drivers/dri/radeon/depend; fi
+	if ! [ -f src/mesa/drivers/dri/mga/depend ];    then touch src/mesa/drivers/dri/mga/depend;    fi
+	if ! [ -f src/mesa/drivers/dri/fb/depend ];     then touch src/mesa/drivers/dri/fb/depend;     fi
+	if ! [ -f src/glu/mesa/depend  ] ; then touch src/glu/mesa/depend  ; fi
+	if ! [ -f src/glu/sgi/depend   ] ; then touch src/glu/sgi/depend   ; fi
+	if ! [ -f src/glu/mini/depend  ] ; then touch src/glu/mini/depend  ; fi
+	if ! [ -f src/glut/glx/depend  ] ; then touch src/glut/glx/depend  ; fi
+	if ! [ -f src/glut/mini/depend ] ; then touch src/glut/mini/depend ; fi
+	if ! [ -f src/glx/mini/depend  ] ; then touch src/glx/mini/depend  ; fi
+	if ! [ -f progs/tests/depend   ] ; then touch progs/tests/depend   ; fi
+	if ! [ -f progs/miniglx/depend ] ; then touch progs/miniglx/depend ; fi
 	-rm -f include/GL/*~
-	-rm -f src/glu/mesa/*.o src/glu/mesa/*~ src-glu/*.a
-	-rm -f src/glu/sgi/*/*.o src/glu/sgi/*/*/*.o
-	-rm -f src/glut/glx/*.o
-	-rm -f src/miniglx/*.o
-	-rm -f src/miniglu/*.o
-	-rm -f src/miniglut/*.o
-	-rm -f progs/demos/*.o
-	-rm -f progs/redbook/*.o progs/redbook/*~
-	-rm -f progs/xdemos/*.o progs/xdemos/*~
-	-rm -f progs/samples/*.o progs/samples/*~
-	-rm -f progs/tests/*.o progs/tests/*~
-	-rm -f src/glw/*.o
+	cd src/mesa          && $(MAKE) -f Makefile.X11 $@ || true
+	cd src/mesa/drivers/dri/r200   && $(MAKE) -f Makefile.X11 $@ || true
+	cd src/mesa/drivers/dri/r128   && $(MAKE) -f Makefile.X11 $@ || true
+	cd src/mesa/drivers/dri/radeon && $(MAKE) -f Makefile.X11 $@ || true
+	cd src/mesa/drivers/dri/mga    && $(MAKE) -f Makefile.X11 $@ || true
+	cd src/mesa/drivers/dri/fb     && $(MAKE) -f Makefile.X11 $@ || true
+	cd src/glu/mesa      && $(MAKE) -f Makefile.X11 $@ || true
+	cd src/glu/sgi       && $(MAKE) -f Makefile.X11 $@ || true
+	cd src/glu/mini      && $(MAKE) -f Makefile.X11 $@ || true
+	cd src/glut/glx      && $(MAKE) -f Makefile.X11 $@ || true
+	cd src/glut/mini     && $(MAKE) -f Makefile.X11 $@ || true
+	cd src/glw           && $(MAKE) -f Makefile.X11 $@ || true
+	cd src/glx/mini      && $(MAKE) -f Makefile.X11 $@ || true
+	cd progs/demos       && $(MAKE) -f Makefile.X11 $@ || true
+	cd progs/redbook     && $(MAKE) -f Makefile.X11 $@ || true
+	cd progs/xdemos      && $(MAKE) -f Makefile.X11 $@ || true
+	cd progs/samples     && $(MAKE) -f Makefile.X11 $@ || true
+	cd progs/tests       && $(MAKE) -f Makefile.X11 $@ || true
+	cd progs/miniglx     && $(MAKE) -f Makefile.X11 $@ || true
+	if [ -f src/mesa/depend      ] ; then rm src/mesa/depend      ; fi
+	if [ -f src/mesa/drivers/dri/r200/depend ];   then rm -f src/mesa/drivers/dri/r200/depend;   fi
+	if [ -f src/mesa/drivers/dri/r128/depend ];   then rm -f src/mesa/drivers/dri/r128/depend;   fi
+	if [ -f src/mesa/drivers/dri/radeon/depend ]; then rm -f src/mesa/drivers/dri/radeon/depend; fi
+	if [ -f src/mesa/drivers/dri/mga/depend ];    then rm -f src/mesa/drivers/dri/mga/depend;    fi
+	if [ -f src/mesa/drivers/dri/fb/depend ];     then rm -f src/mesa/drivers/dri/fb/depend;     fi
+	if [ -f src/glu/mesa/depend  ] ; then rm -f src/glu/mesa/depend  ; fi
+	if [ -f src/glu/sgi/depend   ] ; then rm -f src/glu/sgi/depend   ; fi
+	if [ -f src/glu/mini/depend  ] ; then rm -f src/glu/mini/depend  ; fi
+	if [ -f src/glut/glx/depend  ] ; then rm -f src/glut/glx/depend  ; fi
+	if [ -f src/glut/mini/depend ] ; then rm -f src/glut/mini/depend ; fi
+	if [ -f src/glx/mini/depend  ] ; then rm -f src/glx/mini/depend  ; fi
+	if [ -f progs/tests/depend   ] ; then rm -f progs/tests/depend   ; fi
+	if [ -f progs/miniglx/depend ] ; then rm -f progs/miniglx/depend ; fi
 
 # Remove everything that can be remade
 realclean: clean
diff --git a/progs/demos/Makefile.X11 b/progs/demos/Makefile.X11
index 74e92fa2880..a26ed3d398b 100644
--- a/progs/demos/Makefile.X11
+++ b/progs/demos/Makefile.X11
@@ -81,12 +81,12 @@ default:
 	@echo "Specify a target configuration"
 
 clean:
-	-rm *.o *~
+	-rm -f *.o *~
 
 realclean:
-	-rm $(PROGS)
-	-rm *.o *~
-	-rm readtex.[ch]
+	-rm -f $(PROGS)
+	-rm -f *.o *~
+	-rm -f readtex.[ch]
 
 targets: readtex.c readtex.h $(PROGS)
 
diff --git a/progs/redbook/Makefile.X11 b/progs/redbook/Makefile.X11
index f72ea44cd4e..aa3585cfe4b 100644
--- a/progs/redbook/Makefile.X11
+++ b/progs/redbook/Makefile.X11
@@ -38,11 +38,11 @@ default:
 	@echo "Specify a target configuration"
 
 clean:
-	-rm *.o *~
+	-rm -f *.o *~
 
 realclean:
-	-rm $(PROGS)
-	-rm *.o *~
+	-rm -f $(PROGS)
+	-rm -f *.o *~
 
 targets: $(PROGS)
 
diff --git a/progs/samples/Makefile.X11 b/progs/samples/Makefile.X11
index 8a63517951e..d7efd25cd57 100644
--- a/progs/samples/Makefile.X11
+++ b/progs/samples/Makefile.X11
@@ -32,11 +32,11 @@ default:
 	@echo "Specify a target configuration"
 
 clean:
-	-rm *.o *~
+	-rm -f *.o *~
 
 realclean:
-	-rm $(PROGS)
-	-rm *.o *~
+	-rm -f $(PROGS)
+	-rm -f *.o *~
 
 targets: $(PROGS)
 
diff --git a/progs/xdemos/Makefile.X11 b/progs/xdemos/Makefile.X11
index 264fc2491c5..de2273c5e4a 100644
--- a/progs/xdemos/Makefile.X11
+++ b/progs/xdemos/Makefile.X11
@@ -61,11 +61,11 @@ default:
 	@echo "Specify a target configuration (i.e. make -f Makefile.X11 linux)"
 
 clean:
-	-rm *.o *~
+	-rm -f *.o *~
 
 realclean:
-	-rm $(PROGS)
-	-rm *.o *~
+	-rm -f $(PROGS)
+	-rm -f *.o *~
 
 targets: $(PROGS)
 
diff --git a/src/glu/mesa/Makefile.X11 b/src/glu/mesa/Makefile.X11
index b50db58c36f..2265620fe6b 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 d0ef2e50f06..4462d562612 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 76befaa0fa4..7202aa84ffb 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 097a665e4ec..bbdc6a690ce 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 90b7f9d35ff..888aebd52cd 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 2e818f0b017..115854393a7 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 12790a56b74..373608a325d 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 2c73f4d5212..62f4b4b94c1 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