clean more

R=r
DELTA=40  (9 added, 3 deleted, 28 changed)
OCL=35277
CL=35305

diff --git a/src/clean.bash b/src/clean.bash
index cf29029517006b06e6e73610c7e583a7dd7ce0f4..1c568a591059a581edffdc46e4e3cb1205919ada 100755 (executable)
--- a/src/clean.bash
+++ b/src/clean.bash
@@ -5,15 +5,15 @@
 
 rm -rf $GOROOT/pkg/[0-9a-zA-Z_]*
 rm -f $GOROOT/lib/*.[6a]
-for i in lib9 libbio libmach libregexp cmd pkg
-do
+for i in lib9 libbio libcgo libmach libregexp cmd pkg \
+       ../misc/cgo/gmp ../misc/cgo/stdio \
+       ../usr/r/rpc ../usr/dsymonds/iterable \
+       ../usr/austin/eval ../usr/austin/ogle ../test/bench
+do(
        cd $i
-       case $i in
-       cmd)
+       if test -f clean.bash; then
                bash clean.bash
-               ;;
-       *)
+       else
                make clean
-       esac
-       cd ..
-done
+       fi
+)done

diff --git a/src/cmd/5a/Makefile b/src/cmd/5a/Makefile
index ac2931ed04a424cc085d2e59c8fa166cf9791c96..87c9d68cda732a3f2318ece4d9212e550187a5ca 100644 (file)
--- a/src/cmd/5a/Makefile
+++ b/src/cmd/5a/Makefile
@@ -34,7 +34,7 @@ y.tab.c: y.tab.h
        test -f y.tab.c && touch y.tab.c
 
 clean:
-       rm -f $(OFILES) $(TARG) *.5 enam.c 5.out a.out y.tab.h y.tab.c
+       rm -f *.$O $(TARG) *.5 enam.c 5.out a.out y.tab.h y.tab.c
 
 install: $(TARG)
        cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/5c/Makefile b/src/cmd/5c/Makefile
index 96219bdbaf3f4e14e0e655db3750f7d9ea3829d8..be9f4c52a99ecb255a5c315e955d3fdeae43c404 100644 (file)
--- a/src/cmd/5c/Makefile
+++ b/src/cmd/5c/Makefile
@@ -34,7 +34,7 @@ $(TARG): $(OFILES) $(LIB)
 $(OFILES): $(HFILES)
 
 clean:
-       rm -f $(OFILES) $(TARG) *.5 enam.c 5.out a.out
+       rm -f *.$O $(TARG) *.5 enam.c 5.out a.out
 
 install: $(TARG)
        cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/5g/Makefile b/src/cmd/5g/Makefile
index 2d4831ba9e330d26c45a69daeb14ce2cce0fa5e8..05915a75e54e51f94eea45fd2330b9b5bd66bc3e 100644 (file)
--- a/src/cmd/5g/Makefile
+++ b/src/cmd/5g/Makefile
@@ -32,7 +32,7 @@ $(TARG): $(OFILES) $(LIB)
 $(OFILES): $(HFILES)
 
 clean:
-       rm -f $(OFILES) $(TARG) *.5 enam.c 5.out a.out
+       rm -f *.o $(TARG) *.5 enam.c 5.out a.out
 
 install: $(TARG)
        cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/5l/Makefile b/src/cmd/5l/Makefile
index d2c2f76e1edcab072f7ada874d0d66e1d7c4bb10..44ee2ead121eabb6db6ea960e689c3469b44257a 100644 (file)
--- a/src/cmd/5l/Makefile
+++ b/src/cmd/5l/Makefile
@@ -34,7 +34,7 @@ enam.c: 5.out.h
        sh mkenam
 
 clean:
-       rm -f $(OFILES) $(TARG) *.5 enam.c 5.out a.out
+       rm -f *.o $(TARG) *.5 enam.c 5.out a.out
 
 install: $(TARG)
        cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/6a/Makefile b/src/cmd/6a/Makefile
index 38548c05f07a0ba68fc2ef620b375269c017d9fe..0050921b57712ca261c41841d65a387bd0acf2f1 100644 (file)
--- a/src/cmd/6a/Makefile
+++ b/src/cmd/6a/Makefile
@@ -34,7 +34,7 @@ y.tab.c: y.tab.h
        test -f y.tab.c && touch y.tab.c
 
 clean:
-       rm -f $(OFILES) $(TARG) *.6 enam.c 6.out a.out y.tab.h y.tab.c
+       rm -f *.$O $(TARG) *.6 enam.c 6.out a.out y.tab.h y.tab.c
 
 install: $(TARG)
        cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/6c/Makefile b/src/cmd/6c/Makefile
index d5daa9e1b47eb2b64a163b432820efd217c14ad5..1cae39e1be559dd4412df38edc59fd277a6f9bbb 100644 (file)
--- a/src/cmd/6c/Makefile
+++ b/src/cmd/6c/Makefile
@@ -35,7 +35,7 @@ $(TARG): $(OFILES) $(LIB)
 $(OFILES): $(HFILES)
 
 clean:
-       rm -f $(OFILES) $(TARG) *.6 enam.c 6.out a.out
+       rm -f *.$O $(TARG) *.6 enam.c 6.out a.out
 
 install: $(TARG)
        cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/6g/Makefile b/src/cmd/6g/Makefile
index 2a1819618e23c2120777d5388f81bc36a3823250..6538c55289bd4640274c1bdf07881d5240223e38 100644 (file)
--- a/src/cmd/6g/Makefile
+++ b/src/cmd/6g/Makefile
@@ -33,7 +33,7 @@ $(TARG): $(OFILES) $(LIB)
 $(OFILES): $(HFILES)
 
 clean:
-       rm -f $(OFILES) $(TARG) *.6 enam.c 6.out a.out
+       rm -f $(TARG) enam.c 6.out a.out *.$O *.6
 
 install: $(TARG)
        cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/6l/Makefile b/src/cmd/6l/Makefile
index 4821f9d91e529b6cee2ce240ca2ebf3357751b4f..82de18448dba0de2596ad3b7514347a6c4099fd9 100644 (file)
--- a/src/cmd/6l/Makefile
+++ b/src/cmd/6l/Makefile
@@ -37,7 +37,7 @@ enam.c: 6.out.h
        sh mkenam
 
 clean:
-       rm -f $(OFILES) $(TARG) *.6 enam.c 6.out a.out
+       rm -f *.$O $(TARG) *.6 enam.c 6.out a.out
 
 install: $(TARG)
        cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/8a/Makefile b/src/cmd/8a/Makefile
index ae221632b4ec2d72e5744f864d1f077bd41aa472..cb5897e0848e0390426a525c92df2ae9257ddb74 100644 (file)
--- a/src/cmd/8a/Makefile
+++ b/src/cmd/8a/Makefile
@@ -11,12 +11,10 @@ HFILES=\
        a.h\
        y.tab.h\
        ../8l/8.out.h\
-       compat.h\
 
 OFILES=\
        y.tab.$O\
        lex.$O\
-       compat.$O\
        ../8l/enam.$O\
 
 YFILES=\
@@ -36,7 +34,7 @@ y.tab.c: y.tab.h
        test -f y.tab.c && touch y.tab.c
 
 clean:
-       rm -f $(OFILES) $(TARG) *.6 enam.c 6.out a.out y.tab.h y.tab.c
+       rm -f *.$O $(TARG) *.6 enam.c 6.out a.out y.tab.h y.tab.c
 
 install: $(TARG)
        cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/8c/Makefile b/src/cmd/8c/Makefile
index 5d8d79fe33e6c0ca9714e77a879c3744e3c6af02..0f3973910bbda27fdf062cb450b1626106629f6c 100644 (file)
--- a/src/cmd/8c/Makefile
+++ b/src/cmd/8c/Makefile
@@ -37,7 +37,7 @@ $(TARG): $(OFILES) $(LIB)
 $(OFILES): $(HFILES)
 
 clean:
-       rm -f $(OFILES) $(TARG) *.8 8.out a.out
+       rm -f *.$O $(TARG) *.8 8.out a.out
 
 install: $(TARG)
        cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/8g/Makefile b/src/cmd/8g/Makefile
index 7325d62d9c89d14131c724f86d290382678f11de..b5c272ea459be0e5ca805cf3814fe6d8ba5e19ab 100644 (file)
--- a/src/cmd/8g/Makefile
+++ b/src/cmd/8g/Makefile
@@ -34,7 +34,7 @@ $(TARG): $(OFILES) $(LIB)
 $(OFILES): $(HFILES)
 
 clean:
-       rm -f $(OFILES) $(TARG) *.8 enam.c 8.out a.out
+       rm -f *.$O $(TARG) *.8 enam.c 8.out a.out
 
 install: $(TARG)
        cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/8l/Makefile b/src/cmd/8l/Makefile
index e0ba629e6e409e8fee5459f4709048437f47d42c..4520a4a1ecba041c55a0174a3894e373df0b0a59 100644 (file)
--- a/src/cmd/8l/Makefile
+++ b/src/cmd/8l/Makefile
@@ -36,7 +36,7 @@ enam.c: 8.out.h
        sh mkenam
 
 clean:
-       rm -f $(OFILES) $(TARG) *.8 enam.c 8.out a.out
+       rm -f *.$O $(TARG) *.8 enam.c 8.out a.out
 
 install: $(TARG)
        cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/ar/Makefile b/src/cmd/ar/Makefile
index f0e51afdd493b356b16076aa6df8e016b115c711..cbed2617d8868832216123f873ff30ad4d0582fc 100644 (file)
--- a/src/cmd/ar/Makefile
+++ b/src/cmd/ar/Makefile
@@ -16,7 +16,7 @@ $(TARG): $(OFILES)
        $(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lbio -l9
 
 clean:
-       rm -f $(OFILES) $(TARG)
+       rm -f *.$O $(TARG)
 
 install: $(TARG)
        cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/cc/Makefile b/src/cmd/cc/Makefile
index 9eea5a17899ddbabd582ae260ce3fb5f72a3ea49..98b89f0a286124c69f4672448afbbacd4c94b365 100644 (file)
--- a/src/cmd/cc/Makefile
+++ b/src/cmd/cc/Makefile
@@ -42,6 +42,6 @@ y.tab.c: y.tab.h
        test -f y.tab.c && touch y.tab.c
 
 clean:
-       rm -f $(OFILES) *.6 enam.c 6.out a.out y.tab.h y.tab.c $(LIB)
+       rm -f *.$O *.6 enam.c 6.out a.out y.tab.h y.tab.c $(LIB)
 
 install: $(LIB)

diff --git a/src/cmd/clean.bash b/src/cmd/clean.bash
index 8e6e5a7f1f7842eadea9c406f660645d3ce42a36..8432c9f22bb49720281ed913ae7043e5e8d51389 100644 (file)
--- a/src/cmd/clean.bash
+++ b/src/cmd/clean.bash
@@ -3,7 +3,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-for i in cc 6l 6a 6c 8l 8a 8c 8g 5l 5a 5c 5g gc 6g ar db nm acid cov ebnflint godefs godoc gofmt prof gotest
+for i in cc 6l 6a 6c 8l 8a 8c 8g 5l 5a 5c 5g gc 6g ar db nm acid cgo cov ebnflint godefs godoc gofmt prof gotest
 do
        cd $i
        make clean

diff --git a/src/cmd/cov/Makefile b/src/cmd/cov/Makefile
index 9c0d8abaa051a0eb73804f57e825005a75daf37a..a264fdc21cc1ade8c40a1e7fc79b16142882c8bd 100644 (file)
--- a/src/cmd/cov/Makefile
+++ b/src/cmd/cov/Makefile
@@ -20,7 +20,7 @@ $(TARG): $(OFILES)
        $(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lregexp9 -lbio -l9
 
 clean:
-       rm -f $(OFILES) $(TARG)
+       rm -f *.$O $(TARG)
 
 install: install-$(shell uname | tr A-Z a-z)
 install-linux: install-default

diff --git a/src/cmd/gc/Makefile b/src/cmd/gc/Makefile
index 1e116a9acffa792d96078f53a98c5b12ed7f336a..d552a910157f736d4700f7b7e876052216e2e17a 100644 (file)
--- a/src/cmd/gc/Makefile
+++ b/src/cmd/gc/Makefile
@@ -64,6 +64,6 @@ opnames.h:    mkopnames go.h
        ./mkopnames go.h >opnames.h
 
 clean:
-       rm -f $(OFILES) *.6 enam.c 6.out a.out y.tab.h y.tab.c $(LIB) mkbuiltin1 builtin.c _builtin.c
+       rm -f *.[568o] enam.c [568].out a.out y.tab.h y.tab.c $(LIB) mkbuiltin1 builtin.c _builtin.c
 
 install: $(LIB)

diff --git a/src/cmd/godefs/Makefile b/src/cmd/godefs/Makefile
index 819f94a004555127eca489b0a72fa932c693ba5a..d3215c87d6f1c5f47500ce3ba44992dae6d48e8f 100644 (file)
--- a/src/cmd/godefs/Makefile
+++ b/src/cmd/godefs/Makefile
@@ -16,7 +16,7 @@ $(TARG): $(OFILES)
        $(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lbio -l9
 
 clean:
-       rm -f $(OFILES) $(TARG)
+       rm -f *.$O $(TARG)
 
 install: $(TARG)
        cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/nm/Makefile b/src/cmd/nm/Makefile
index 00d9beebfe4c311694cb97fe4530f57a04c08f63..b2134e6b5de2c8db11aecb32cc393190c79d4139 100644 (file)
--- a/src/cmd/nm/Makefile
+++ b/src/cmd/nm/Makefile
@@ -16,7 +16,7 @@ $(TARG): $(OFILES)
        $(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lbio -l9
 
 clean:
-       rm -f $(OFILES) $(TARG)
+       rm -f *.$O $(TARG)
 
 install: $(TARG)
        cp $(TARG) $(GOBIN)/$(TARG)

diff --git a/src/cmd/prof/Makefile b/src/cmd/prof/Makefile
index daab2df1bfaf7d6607fee457af1fa6a794c140cb..7ebc19d63fac91d41cdcab4633e61150dd2df190 100644 (file)
--- a/src/cmd/prof/Makefile
+++ b/src/cmd/prof/Makefile
@@ -20,7 +20,7 @@ $(TARG): $(OFILES)
        $(LD) -o $(TARG) -L$(GOROOT)/lib $(OFILES) -lmach -lbio -l9
 
 clean:
-       rm -f $(OFILES) $(TARG)
+       rm -f *.$O $(TARG)
 
 install: install-$(shell uname | tr A-Z a-z)
 install-linux: install-default

diff --git a/test/bench/clean.bash b/test/bench/clean.bash
new file mode 100755 (executable)
index 0000000..d56c0e3
--- /dev/null
+++ b/test/bench/clean.bash
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+OS=568
+rm -f [$OS].out *.[$OS]

diff --git a/usr/austin/ogle/Makefile b/usr/austin/ogle/Makefile
index df0bb2d32d43cc1901b315cc270e728fb6092c75..9ea9beabe9d75f627ad1bf6bded05127c5c44c7d 100644 (file)
--- a/usr/austin/ogle/Makefile
+++ b/usr/austin/ogle/Makefile
@@ -18,6 +18,8 @@ GOFILES=\
        process.go\
        vars.go\
 
+CLEANFILES+=ogle
+
 include $(GOROOT)/src/Make.pkg
 
 main.$O: main.go package