Commit 5fd77da4 authored by Brian Paul's avatar Brian Paul

improved 'clean' targets (Otto Solares)

parent 7d8eb060
# $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 # Mesa 3-D graphics library
# Version: 5.1 # Version: 5.1
...@@ -269,24 +269,54 @@ linux-solo: ...@@ -269,24 +269,54 @@ linux-solo:
# Remove .o files, emacs backup files, etc. # Remove .o files, emacs backup files, etc.
clean: clean:
-rm -f src/mesa/*/*.o if ! [ -f src/mesa/depend ] ; then touch src/mesa/depend ; fi
-rm -f src/mesa/drivers/*/*.o if ! [ -f src/mesa/drivers/dri/r200/depend ]; then touch src/mesa/drivers/dri/r200/depend; fi
-rm -f src/mesa/drivers/*/*/*.o if ! [ -f src/mesa/drivers/dri/r128/depend ]; then touch src/mesa/drivers/dri/r128/depend; fi
-rm -f src/mesa/drivers/*/*/*/*.o if ! [ -f src/mesa/drivers/dri/radeon/depend ]; then touch src/mesa/drivers/dri/radeon/depend; fi
-rm -f include/*~ 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 include/GL/*~
-rm -f src/glu/mesa/*.o src/glu/mesa/*~ src-glu/*.a cd src/mesa && $(MAKE) -f Makefile.X11 $@ || true
-rm -f src/glu/sgi/*/*.o src/glu/sgi/*/*/*.o cd src/mesa/drivers/dri/r200 && $(MAKE) -f Makefile.X11 $@ || true
-rm -f src/glut/glx/*.o cd src/mesa/drivers/dri/r128 && $(MAKE) -f Makefile.X11 $@ || true
-rm -f src/miniglx/*.o cd src/mesa/drivers/dri/radeon && $(MAKE) -f Makefile.X11 $@ || true
-rm -f src/miniglu/*.o cd src/mesa/drivers/dri/mga && $(MAKE) -f Makefile.X11 $@ || true
-rm -f src/miniglut/*.o cd src/mesa/drivers/dri/fb && $(MAKE) -f Makefile.X11 $@ || true
-rm -f progs/demos/*.o cd src/glu/mesa && $(MAKE) -f Makefile.X11 $@ || true
-rm -f progs/redbook/*.o progs/redbook/*~ cd src/glu/sgi && $(MAKE) -f Makefile.X11 $@ || true
-rm -f progs/xdemos/*.o progs/xdemos/*~ cd src/glu/mini && $(MAKE) -f Makefile.X11 $@ || true
-rm -f progs/samples/*.o progs/samples/*~ cd src/glut/glx && $(MAKE) -f Makefile.X11 $@ || true
-rm -f progs/tests/*.o progs/tests/*~ cd src/glut/mini && $(MAKE) -f Makefile.X11 $@ || true
-rm -f src/glw/*.o 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 # Remove everything that can be remade
realclean: clean realclean: clean
......
...@@ -81,12 +81,12 @@ default: ...@@ -81,12 +81,12 @@ default:
@echo "Specify a target configuration" @echo "Specify a target configuration"
clean: clean:
-rm *.o *~ -rm -f *.o *~
realclean: realclean:
-rm $(PROGS) -rm -f $(PROGS)
-rm *.o *~ -rm -f *.o *~
-rm readtex.[ch] -rm -f readtex.[ch]
targets: readtex.c readtex.h $(PROGS) targets: readtex.c readtex.h $(PROGS)
......
...@@ -38,11 +38,11 @@ default: ...@@ -38,11 +38,11 @@ default:
@echo "Specify a target configuration" @echo "Specify a target configuration"
clean: clean:
-rm *.o *~ -rm -f *.o *~
realclean: realclean:
-rm $(PROGS) -rm -f $(PROGS)
-rm *.o *~ -rm -f *.o *~
targets: $(PROGS) targets: $(PROGS)
......
...@@ -32,11 +32,11 @@ default: ...@@ -32,11 +32,11 @@ default:
@echo "Specify a target configuration" @echo "Specify a target configuration"
clean: clean:
-rm *.o *~ -rm -f *.o *~
realclean: realclean:
-rm $(PROGS) -rm -f $(PROGS)
-rm *.o *~ -rm -f *.o *~
targets: $(PROGS) targets: $(PROGS)
......
...@@ -61,11 +61,11 @@ default: ...@@ -61,11 +61,11 @@ default:
@echo "Specify a target configuration (i.e. make -f Makefile.X11 linux)" @echo "Specify a target configuration (i.e. make -f Makefile.X11 linux)"
clean: clean:
-rm *.o *~ -rm -f *.o *~
realclean: realclean:
-rm $(PROGS) -rm -f $(PROGS)
-rm *.o *~ -rm -f *.o *~
targets: $(PROGS) targets: $(PROGS)
......
...@@ -34,7 +34,7 @@ default: ...@@ -34,7 +34,7 @@ default:
@echo "Specify a target configuration" @echo "Specify a target configuration"
clean: clean:
-rm *.o *~ -rm -f *.o *~
targets: $(LIBDIR)/$(GLU_LIB) targets: $(LIBDIR)/$(GLU_LIB)
......
...@@ -39,7 +39,7 @@ targets: depend libGLU.so.1.1 install ...@@ -39,7 +39,7 @@ targets: depend libGLU.so.1.1 install
libGLU.so.1.1: $(OBJS) Makefile.X11 libGLU.so.1.1: $(OBJS) Makefile.X11
gcc -shared -Wl,-soname,libGLU.so -Wl,-Bsymbolic $(OBJS) $(LIBS) -o $@ gcc -shared -Wl,-soname,libGLU.so -Wl,-Bsymbolic $(OBJS) $(LIBS) -o $@
install: install: libGLU.so.1.1
rm -f $(TOP)/lib/libGLU.so* rm -f $(TOP)/lib/libGLU.so*
install -D libGLU.so.1.1 $(TOP)/lib/libGLU.so.1.1 install -D libGLU.so.1.1 $(TOP)/lib/libGLU.so.1.1
ln -s libGLU.so.1.1 $(TOP)/lib/libGLU.so.1 ln -s libGLU.so.1.1 $(TOP)/lib/libGLU.so.1
...@@ -58,7 +58,7 @@ tags: ...@@ -58,7 +58,7 @@ tags:
# Remove .o and backup files # Remove .o and backup files
clean: clean:
-rm -f *.o *~ *.o *~ *.so -rm -f *.o *~ *.o *~ *.so libGLU.so.1.1
include $(TOP)/Make-config include $(TOP)/Make-config
......
...@@ -131,9 +131,9 @@ default: ...@@ -131,9 +131,9 @@ default:
@echo "Specify a target configuration" @echo "Specify a target configuration"
clean: clean:
-rm *.o */*.o */*/*.o -rm -f *.o */*.o */*/*.o
-rm *.lo */*.lo */*/*.lo -rm -f *.lo */*.lo */*/*.lo
-rm *.la */*.la */*/*.la -rm -f *.la */*.la */*/*.la
targets: $(LIBDIR)/$(GLU_LIB) targets: $(LIBDIR)/$(GLU_LIB)
......
...@@ -52,7 +52,7 @@ targets: depend libglut.so.3.7 install ...@@ -52,7 +52,7 @@ targets: depend libglut.so.3.7 install
libglut.so.3.7: $(OBJS) Makefile.X11 libglut.so.3.7: $(OBJS) Makefile.X11
gcc -shared -Wl,-soname,libglut.so -Wl,-Bsymbolic $(OBJS) $(LIBS) -o $@ gcc -shared -Wl,-soname,libglut.so -Wl,-Bsymbolic $(OBJS) $(LIBS) -o $@
install: install: libglut.so.3.7
rm -f $(TOP)/lib/libglut.so* rm -f $(TOP)/lib/libglut.so*
install -D libglut.so.3.7 $(TOP)/lib/libglut.so.3.7 install -D libglut.so.3.7 $(TOP)/lib/libglut.so.3.7
ln -s libglut.so.3.7 $(TOP)/lib/libglut.so.3 ln -s libglut.so.3.7 $(TOP)/lib/libglut.so.3
...@@ -70,8 +70,8 @@ tags: ...@@ -70,8 +70,8 @@ tags:
# Remove .o and backup files # Remove .o and backup files
clean: clean: depend
-rm -f *.o *~ *.o *~ *.so -rm -f *.o *~ *.o *~ *.so libglut.so.3.7
include $(TOP)/Make-config include $(TOP)/Make-config
......
...@@ -38,7 +38,7 @@ default: ...@@ -38,7 +38,7 @@ default:
@echo "Specify a target configuration" @echo "Specify a target configuration"
clean: clean:
-rm *.o *~ -rm -f *.o *~
targets: $(LIBDIR)/$(GLW_LIB) message targets: $(LIBDIR)/$(GLW_LIB) message
......
...@@ -71,7 +71,8 @@ tags: ...@@ -71,7 +71,8 @@ tags:
# Remove .o and backup files # Remove .o and backup files
clean: clean:
-rm -f drmtest $(TOP)/lib/libGL.so* -rm -f drmtest $(TOP)/lib/libGL.so*
-rm -f */*.o */*~ */*.o */*~ -rm -f libGL.so*
-rm -f *.o *~
include $(TOP)/Make-config include $(TOP)/Make-config
......
...@@ -348,9 +348,9 @@ tags: ...@@ -348,9 +348,9 @@ tags:
# Remove .o and backup files # Remove .o and backup files
clean: clean:
-rm *.a -rm -f *.a
-rm -f */*.o */*~ */*.o */*~ -rm -f */*.o */*~ */*.o */*~
-rm -f drivers/*/*.o -rm -f drivers/*/*.o drivers/*/*/*.o
include $(TOP)/Make-config include $(TOP)/Make-config
......
# $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 # Mesa 3-D graphics library
# Version: 5.0 # Version: 5.0
...@@ -133,6 +133,7 @@ tags: ...@@ -133,6 +133,7 @@ tags:
# Remove .o and backup files # Remove .o and backup files
clean: clean:
-rm -f *.o */*.o *~ *.o *~ *.so server/*.o -rm -f *.o */*.o *~ *.o *~ *.so server/*.o
-rm -f $(SYMLINKS)
include $(TOP)/Make-config include $(TOP)/Make-config
......
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