]> Cypherpunks repositories - gostls13.git/commitdiff
build: remove Make.pkg, Make.tool
authorRuss Cox <rsc@golang.org>
Tue, 31 Jan 2012 04:43:46 +0000 (23:43 -0500)
committerRuss Cox <rsc@golang.org>
Tue, 31 Jan 2012 04:43:46 +0000 (23:43 -0500)
Consequently, remove many package Makefiles,
and shorten the few that remain.

gomake becomes 'go tool make'.

Turn off test phases of run.bash that do not work,
flagged with $BROKEN.  Future CLs will restore these,
but this seemed like a big enough CL already.

R=golang-dev, r
CC=golang-dev
https://golang.org/cl/5601057

175 files changed:
misc/dashboard/builder/Makefile
misc/goplay/Makefile
src/Make.pkg [deleted file]
src/Make.tool [deleted file]
src/buildscript/darwin_386.sh
src/buildscript/darwin_amd64.sh
src/buildscript/freebsd_386.sh
src/buildscript/freebsd_amd64.sh
src/buildscript/linux_386.sh
src/buildscript/linux_amd64.sh
src/buildscript/linux_arm.sh
src/buildscript/netbsd_386.sh
src/buildscript/netbsd_amd64.sh
src/buildscript/openbsd_386.sh
src/buildscript/openbsd_amd64.sh
src/buildscript/plan9_386.sh
src/buildscript/windows_386.sh
src/buildscript/windows_amd64.sh
src/clean.bash
src/cmd/Makefile
src/cmd/cgo/Makefile [deleted file]
src/cmd/fix/Makefile [deleted file]
src/cmd/go/Makefile [deleted file]
src/cmd/godoc/Makefile [deleted file]
src/cmd/gofmt/Makefile [deleted file]
src/cmd/vet/Makefile
src/cmd/yacc/Makefile
src/env.bash
src/make.bash
src/pkg/Makefile [deleted file]
src/pkg/archive/tar/Makefile [deleted file]
src/pkg/archive/zip/Makefile [deleted file]
src/pkg/bufio/Makefile [deleted file]
src/pkg/bytes/Makefile [deleted file]
src/pkg/compress/bzip2/Makefile [deleted file]
src/pkg/compress/flate/Makefile [deleted file]
src/pkg/compress/gzip/Makefile [deleted file]
src/pkg/compress/lzw/Makefile [deleted file]
src/pkg/compress/zlib/Makefile [deleted file]
src/pkg/container/heap/Makefile [deleted file]
src/pkg/container/list/Makefile [deleted file]
src/pkg/container/ring/Makefile [deleted file]
src/pkg/crypto/Makefile [deleted file]
src/pkg/crypto/aes/Makefile [deleted file]
src/pkg/crypto/cipher/Makefile [deleted file]
src/pkg/crypto/des/Makefile [deleted file]
src/pkg/crypto/dsa/Makefile [deleted file]
src/pkg/crypto/ecdsa/Makefile [deleted file]
src/pkg/crypto/elliptic/Makefile [deleted file]
src/pkg/crypto/hmac/Makefile [deleted file]
src/pkg/crypto/md5/Makefile [deleted file]
src/pkg/crypto/rand/Makefile [deleted file]
src/pkg/crypto/rc4/Makefile [deleted file]
src/pkg/crypto/rsa/Makefile [deleted file]
src/pkg/crypto/sha1/Makefile [deleted file]
src/pkg/crypto/sha256/Makefile [deleted file]
src/pkg/crypto/sha512/Makefile [deleted file]
src/pkg/crypto/subtle/Makefile [deleted file]
src/pkg/crypto/tls/Makefile [deleted file]
src/pkg/crypto/x509/Makefile [deleted file]
src/pkg/crypto/x509/pkix/Makefile [deleted file]
src/pkg/database/sql/Makefile [deleted file]
src/pkg/database/sql/driver/Makefile [deleted file]
src/pkg/debug/dwarf/Makefile [deleted file]
src/pkg/debug/elf/Makefile [deleted file]
src/pkg/debug/macho/Makefile [deleted file]
src/pkg/debug/pe/Makefile [deleted file]
src/pkg/encoding/ascii85/Makefile [deleted file]
src/pkg/encoding/asn1/Makefile [deleted file]
src/pkg/encoding/base32/Makefile [deleted file]
src/pkg/encoding/base64/Makefile [deleted file]
src/pkg/encoding/binary/Makefile [deleted file]
src/pkg/encoding/csv/Makefile [deleted file]
src/pkg/encoding/gob/Makefile
src/pkg/encoding/gob/debug.go
src/pkg/encoding/hex/Makefile [deleted file]
src/pkg/encoding/json/Makefile [deleted file]
src/pkg/encoding/pem/Makefile [deleted file]
src/pkg/encoding/xml/Makefile [deleted file]
src/pkg/errors/Makefile [deleted file]
src/pkg/exp/ebnf/Makefile [deleted file]
src/pkg/exp/ebnflint/Makefile [deleted file]
src/pkg/exp/gotype/Makefile [deleted file]
src/pkg/exp/html/Makefile [deleted file]
src/pkg/exp/inotify/Makefile [deleted file]
src/pkg/exp/norm/Makefile
src/pkg/exp/proxy/Makefile [deleted file]
src/pkg/exp/terminal/Makefile [deleted file]
src/pkg/exp/types/Makefile [deleted file]
src/pkg/exp/utf8string/Makefile [deleted file]
src/pkg/exp/winfsnotify/Makefile [deleted file]
src/pkg/expvar/Makefile [deleted file]
src/pkg/flag/Makefile [deleted file]
src/pkg/fmt/Makefile [deleted file]
src/pkg/go/ast/Makefile [deleted file]
src/pkg/go/build/Makefile
src/pkg/go/doc/Makefile
src/pkg/go/parser/Makefile [deleted file]
src/pkg/go/printer/Makefile [deleted file]
src/pkg/go/scanner/Makefile [deleted file]
src/pkg/go/token/Makefile [deleted file]
src/pkg/hash/Makefile [deleted file]
src/pkg/hash/adler32/Makefile [deleted file]
src/pkg/hash/crc32/Makefile [deleted file]
src/pkg/hash/crc64/Makefile [deleted file]
src/pkg/hash/fnv/Makefile [deleted file]
src/pkg/html/Makefile [deleted file]
src/pkg/html/template/Makefile [deleted file]
src/pkg/image/Makefile [deleted file]
src/pkg/image/color/Makefile [deleted file]
src/pkg/image/draw/Makefile [deleted file]
src/pkg/image/gif/Makefile [deleted file]
src/pkg/image/jpeg/Makefile [deleted file]
src/pkg/image/png/Makefile [deleted file]
src/pkg/index/suffixarray/Makefile [deleted file]
src/pkg/io/Makefile [deleted file]
src/pkg/io/ioutil/Makefile [deleted file]
src/pkg/log/Makefile [deleted file]
src/pkg/log/syslog/Makefile [deleted file]
src/pkg/math/Makefile [deleted file]
src/pkg/math/big/Makefile [deleted file]
src/pkg/math/cmplx/Makefile [deleted file]
src/pkg/math/rand/Makefile [deleted file]
src/pkg/mime/Makefile [deleted file]
src/pkg/mime/multipart/Makefile [deleted file]
src/pkg/net/Makefile [deleted file]
src/pkg/net/http/Makefile [deleted file]
src/pkg/net/http/cgi/Makefile [deleted file]
src/pkg/net/http/fcgi/Makefile [deleted file]
src/pkg/net/http/httptest/Makefile [deleted file]
src/pkg/net/http/httputil/Makefile [deleted file]
src/pkg/net/http/pprof/Makefile [deleted file]
src/pkg/net/mail/Makefile [deleted file]
src/pkg/net/rpc/Makefile [deleted file]
src/pkg/net/rpc/jsonrpc/Makefile [deleted file]
src/pkg/net/smtp/Makefile [deleted file]
src/pkg/net/textproto/Makefile [deleted file]
src/pkg/net/url/Makefile [deleted file]
src/pkg/old/netchan/Makefile [deleted file]
src/pkg/old/regexp/Makefile [deleted file]
src/pkg/old/template/Makefile [deleted file]
src/pkg/os/Makefile [deleted file]
src/pkg/os/exec/Makefile [deleted file]
src/pkg/os/signal/Makefile [deleted file]
src/pkg/os/user/Makefile [deleted file]
src/pkg/path/Makefile [deleted file]
src/pkg/path/filepath/Makefile [deleted file]
src/pkg/path/filepath/path_test.go
src/pkg/reflect/Makefile [deleted file]
src/pkg/regexp/Makefile [deleted file]
src/pkg/regexp/syntax/Makefile [deleted file]
src/pkg/runtime/Makefile
src/pkg/runtime/cgo/Makefile [deleted file]
src/pkg/runtime/debug/Makefile [deleted file]
src/pkg/runtime/pprof/Makefile [deleted file]
src/pkg/sort/Makefile [deleted file]
src/pkg/strconv/Makefile [deleted file]
src/pkg/strings/Makefile [deleted file]
src/pkg/sync/Makefile [deleted file]
src/pkg/sync/atomic/Makefile [deleted file]
src/pkg/syscall/Makefile [deleted file]
src/pkg/testing/Makefile [deleted file]
src/pkg/testing/iotest/Makefile [deleted file]
src/pkg/testing/quick/Makefile [deleted file]
src/pkg/testing/script/Makefile [deleted file]
src/pkg/text/scanner/Makefile [deleted file]
src/pkg/text/tabwriter/Makefile [deleted file]
src/pkg/text/template/Makefile [deleted file]
src/pkg/text/template/parse/Makefile [deleted file]
src/pkg/time/Makefile [deleted file]
src/pkg/unicode/Makefile
src/pkg/unicode/utf16/Makefile [deleted file]
src/pkg/unicode/utf8/Makefile [deleted file]
src/run.bash
test/run

index f1d9c549722b021f92d0d85b65d46702af8fc49e..abf3755ab6b47a97e29168e947f3b5d33db402da 100644 (file)
@@ -2,13 +2,8 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../src/Make.inc
+gobuilder: $(shell ls *.go)
+       go build -o $@ $^
 
-TARG=gobuilder
-GOFILES=\
-       exec.go\
-       http.go\
-       main.go\
-       package.go\
-
-include ../../../src/Make.cmd
+clean:
+       rm -f gobuilder
index 28d0245119a06390de6c9b9b3c893b896870ec95..a6db75ac3e671f5db4fa35d571cd9dda16eb115c 100644 (file)
@@ -2,12 +2,5 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../src/Make.inc
-
-TARG=goplay
-
-GOFILES=\
-       goplay.go\
-
-include ../../src/Make.cmd
-
+goplay: goplay.go
+       go build goplay.go
diff --git a/src/Make.pkg b/src/Make.pkg
deleted file mode 100644 (file)
index 7e11df6..0000000
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-all: package
-package: _obj/$(TARG).a
-testpackage: _test/$(TARG).a
-
-include $(QUOTED_GOROOT)/src/Make.common
-
-# The quietgcc wrapper is for our own source code
-# while building the libraries, not arbitrary source code
-# as encountered by cgo.
-ifeq ($(HOST_CC),quietgcc)
-HOST_CC:=gcc
-endif
-ifeq ($(HOST_LD),quietgcc)
-HOST_LD:=gcc
-endif
-
-# GNU Make 3.80 has a bug in lastword
-# elem=$(lastword $(subst /, ,$(TARG)))
-TARG_words=$(subst /, ,$(TARG))
-elem=$(word $(words $(TARG_words)),$(TARG_words))
-
-ifeq ($(elem),$(TARG))
-dir=
-else
-dir=$(patsubst %/$(elem),%,$(TARG))
-endif
-
-pkgdir=$(QUOTED_GOROOT)/pkg/$(GOOS)_$(GOARCH)
-
-ifeq ($(TARGDIR),)
-TARGDIR:=$(pkgdir)
-endif
-
-INSTALLFILES+=$(TARGDIR)/$(TARG).a
-
-# The rest of the cgo rules are below, but these variable updates
-# must be done here so they apply to the main rules.
-ifdef CGOFILES
-GOFILES+=$(patsubst %.go,_obj/%.cgo1.go,$(CGOFILES)) _obj/_cgo_gotypes.go
-CGO_OFILES+=$(patsubst %.go,%.cgo2.o,$(CGOFILES)) _cgo_export.o
-OFILES+=_cgo_defun.$O _cgo_import.$O $(CGO_OFILES)
-endif
-
-ifdef SWIGFILES
-GOFILES+=$(patsubst %.swig,_obj/%.go,$(patsubst %.swigcxx,%.swig,$(SWIGFILES)))
-OFILES+=$(patsubst %.swig,_obj/%_gc.$O,$(patsubst %.swigcxx,%.swig,$(SWIGFILES)))
-SWIG_PREFIX=$(subst /,-,$(TARG))
-SWIG_SOS+=$(patsubst %.swig,_obj/$(SWIG_PREFIX)-%.so,$(patsubst %.swigcxx,%.swig,$(SWIGFILES)))
-INSTALLFILES+=$(patsubst %.swig,$(TARGDIR)/swig/$(SWIG_PREFIX)-%.so,$(patsubst %.swigcxx,%.swig,$(SWIGFILES)))
-endif
-
-PREREQ+=$(patsubst %,%.make,$(DEPS))
-
-coverage:
-       go test
-       6cov -g $(shell pwd) $O.out | grep -v '_test\.go:'
-
-CLEANFILES+=*.so _obj _test _testmain.go *.exe _cgo* test.out build.out
-
-test:
-       go test
-
-testshort:
-       go test -test.short -test.timeout=2m
-
-bench:
-       go test -test.bench=. -test.run="Do not run tests"
-
-nuke: clean
-       rm -f $(TARGDIR)/$(TARG).a
-
-testpackage-clean:
-       rm -f _test/$(TARG).a
-
-install: $(INSTALLFILES)
-
-$(TARGDIR)/$(TARG).a: _obj/$(TARG).a
-       @mkdir -p $(TARGDIR)/$(dir)
-       cp _obj/$(TARG).a "$@"
-
-_go_.$O: $(GOFILES) $(PREREQ)
-       $(GC) $(GCFLAGS) $(GCIMPORTS) -p $(TARG) -o $@ $(GOFILES)
-
-_gotest_.$O: $(GOFILES) $(GOTESTFILES) $(PREREQ)
-       $(GC) $(GCFLAGS) $(GCIMPORTS) -p $(TARG) -o $@ $(GOFILES) $(GOTESTFILES)
-
-_obj/$(TARG).a: _go_.$O $(OFILES)
-       @mkdir -p _obj/$(dir)
-       rm -f _obj/$(TARG).a
-       "$(GOROOT)/bin/go-tool/pack" grc $@ _go_.$O $(OFILES)
-
-importpath:
-       @echo $(TARG)
-
-dir:
-       @echo $(dir)
-
-# To use cgo in a Go package, add a line
-#
-#      CGOFILES=x.go y.go
-#
-# to the main Makefile.  This signals that cgo should process x.go
-# and y.go when building the package.
-# There are three optional variables to set, CGO_CFLAGS, CGO_LDFLAGS,
-# and CGO_DEPS, which specify compiler flags, linker flags, and linker
-# dependencies to use when compiling (using gcc) the C support for
-# x.go and y.go.
-
-# Cgo translates each x.go file listed in $(CGOFILES) into a basic
-# translation of x.go, called _obj/x.cgo1.go. Additionally, three other
-# files are created:
-#
-#      _obj/_cgo_gotypes.go    - declarations needed for all .go files in the package; imports "unsafe"
-#      _obj/_cgo_defun.c       - C trampoline code to be compiled with 6c and linked into the package
-#      _obj/x.cgo2.c   - C implementations compiled with gcc to create a dynamic library
-#
-
-ifdef CGOFILES
-_obj/_cgo_run: $(CGOFILES)
-       @mkdir -p _obj
-       CGOPKGPATH=$(dir) cgo -- $(CGO_CFLAGS) $(CGOFILES)
-       touch _obj/_cgo_run
-
-# _CGO_CFLAGS and _CGO_LDFLAGS are defined via the evaluation of _cgo_flags.
-# The include happens before the commands in the recipe run,
-# so it cannot be done in the same recipe that runs cgo.
-_obj/_load_cgo_flags: _obj/_cgo_run
-       $(eval include _obj/_cgo_flags)
-
-# Include any previous flags in case cgo files are up to date.
--include _obj/_cgo_flags
-
-# Ugly but necessary - cgo writes these files too.
-_obj/_cgo_gotypes.go _obj/_cgo_export.c _obj/_cgo_export.h _obj/_cgo_main.c _obj/_cgo_defun.c: _obj/_load_cgo_flags
-       @true
-
-_obj/%.cgo1.go _obj/%.cgo2.c: _obj/_cgo_defun.c
-       @true
-endif
-
-# Compile rules for gcc source files.
-%.o: %.c
-       $(HOST_CC) $(_CGO_CFLAGS_$(GOARCH)) -g -fPIC -O2 -o $@ -c -I_obj $(CGO_CFLAGS) $(_CGO_CFLAGS) $*.c
-
-%.o: _obj/%.c
-       $(HOST_CC) $(_CGO_CFLAGS_$(GOARCH)) -I . -g -fPIC -O2 -o $@ -c -I_obj $(CGO_CFLAGS) $(_CGO_CFLAGS) $^
-
-# To find out which symbols are needed from external libraries
-# and which libraries are needed, we build a simple a.out that
-# links all the objects we just created and then use cgo -dynimport
-# to inspect it.  That is, we make gcc tell us which dynamic symbols
-# and libraries are involved, instead of duplicating gcc's logic ourselves.
-# After main we have to define all the symbols that will be provided
-# by Go code.  That's crosscall2 and any exported symbols.
-
-_cgo1_.o: _cgo_main.o $(CGO_OFILES) $(CGO_DEPS)
-       $(HOST_CC) $(_CGO_CFLAGS_$(GOARCH)) -g -fPIC -O2 -o $@ $^ $(CGO_LDFLAGS) $(_CGO_LDFLAGS)
-
-_obj/_cgo_import.c: _cgo1_.o
-       @mkdir -p _obj
-       cgo -dynimport _cgo1_.o >$@_ && mv -f $@_ $@
-
-# The rules above added x.cgo1.go and _cgo_gotypes.go to $(GOFILES),
-# added _cgo_defun.$O to $OFILES, and added the installed copy of
-# package_x.so (built from x.cgo2.c) to $(INSTALLFILES).
-
-# Have to run gcc with the right size argument on hybrid 32/64 machines.
-_CGO_CFLAGS_386=-m32
-_CGO_CFLAGS_amd64=-m64
-_CGO_LDFLAGS_freebsd=-shared -lpthread -lm
-_CGO_LDFLAGS_linux=-shared -lpthread -lm
-_CGO_LDFLAGS_darwin=-dynamiclib -Wl,-undefined,dynamic_lookup
-_CGO_LDFLAGS_windows=-shared -lm -mthreads
-
-# Have to compile the runtime header.
-RUNTIME_CFLAGS=-I$(pkgdir)
-
-# Compile _cgo_defun.c with 6c; needs access to the runtime headers.
-_cgo_defun.$O: _obj/_cgo_defun.c
-       $(CC) $(CFLAGS) $(RUNTIME_CFLAGS) -I . -o "$@" _obj/_cgo_defun.c
-
-# To use swig in a Go package, add a line
-#
-#      SWIGFILES=x.swig
-#
-# to the main Makefile.  This signals that SWIG should process the
-#.swig file when building the package.
-#
-# To wrap C code, use an extension of .swig.  To wrap C++ code, use an
-# extension of .swigcxx.
-#
-#      SWIGFILES=myclib.swig mycxxlib.swigcxx
-
-ifdef SWIGFILES
-_obj/%._swig_run _obj/%.go _obj/%_gc.c _obj/%_wrap.c: %.swig
-       @mkdir -p _obj
-       swig -go -module $* -soname $(SWIG_PREFIX)-$*.so -o _obj/$*_wrap.c -outdir _obj $<
-
-_obj/%._swig_run _obj/%.go _obj/%_gc.c _obj/%_wrap.cxx: %.swigcxx
-       @mkdir -p _obj
-       swig -go -c++ -module $* -soname $(SWIG_PREFIX)-$*.so -o _obj/$*_wrap.cxx -outdir _obj $<
-
-_obj/%_gc.$O: _obj/%_gc.c
-       $(CC) $(CFLAGS) -I . -I$(pkgdir) -o "$@" _obj/$*_gc.c
-
-_obj/%_wrap.o: _obj/%_wrap.c
-       $(HOST_CC) $(_CGO_CFLAGS_$(GOARCH)) -I . -g -fPIC -O2 -o $@ -c $^ $(SWIG_CFLAGS)
-
-HOST_CXX=g++
-
-_obj/%_wrapcxx.o: _obj/%_wrap.cxx
-       $(HOST_CXX) $(_CGO_CFLAGS_$(GOARCH)) -I . -g -fPIC -O2 -o $@ -c $^ $(SWIG_CXXFLAGS)
-
-_obj/$(SWIG_PREFIX)-%.so: _obj/%_wrap.o
-       $(HOST_CC) $(_CGO_CFLAGS_$(GOARCH)) -o $@ $^ $(SWIG_LDFLAGS) $(_CGO_LDFLAGS_$(GOOS)) $(_SWIG_LDFLAGS_$(GOOS))
-
-_obj/$(SWIG_PREFIX)-%.so: _obj/%_wrapcxx.o
-       $(HOST_CXX) $(_CGO_CFLAGS_$(GOARCH)) -o $@ $^ $(SWIG_LDFLAGS) $(_CGO_LDFLAGS_$(GOOS)) $(_SWIG_LDFLAGS_$(GOOS))
-
-$(TARGDIR)/swig/$(SWIG_PREFIX)-%.so: _obj/$(SWIG_PREFIX)-%.so
-       @mkdir -p $(TARGDIR)/swig
-       cp $< "$@"
-
-all: $(SWIG_SOS)
-
-SWIG_RPATH=-r $(TARGDIR)/swig
-
-endif
-
-# Generic build rules.
-# These come last so that the rules above can override them
-# for more specific file names.
-%.$O: %.c $(HFILES)
-       $(CC) $(CFLAGS) -o "$@" $*.c
-
-%.$O: _obj/%.c $(HFILES)
-       $(CC) $(CFLAGS) -I . -o "$@" _obj/$*.c
-
-%.$O: %.s $(HFILES)
-       $(AS) $(AFLAGS) $*.s
diff --git a/src/Make.tool b/src/Make.tool
deleted file mode 100644 (file)
index d7858f2..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2009 The Go Authors.  All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-ifeq ($(GOOS),windows)
-TARG:=$(TARG).exe
-endif
-
-# Tools always go into $GOROOT/bin/go-tool
-TOOLDIR=$(QUOTED_GOROOT)/bin/go-tool
-
-all: $(TARG)
-
-include $(QUOTED_GOROOT)/src/Make.common
-
-PREREQ+=$(patsubst %,%.make,$(DEPS))
-
-$(TARG): _go_.$O
-       $(LD) $(LDIMPORTS) -o $@ _go_.$O
-
-_go_.$O: $(GOFILES) $(PREREQ)
-       $(GC) $(GCFLAGS) $(GCIMPORTS) -o $@ $(GOFILES)
-
-install: $(TOOLDIR)/$(TARG)
-
-$(TOOLDIR)/$(TARG): $(TARG)
-       mkdir -p $(TOOLDIR) && cp -f $(TARG) $(TOOLDIR)
-
-CLEANFILES+=$(TARG) _test _testmain.go test.out build.out
-
-nuke: clean
-       rm -f $(TOOLDIR)/$(TARG)
index 529daa520f1ed6b2f751fdde7a3d04f7d6b693da..362362e96d745de3cb3edb27b89e249297b88fc6 100755 (executable)
@@ -491,8 +491,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/darwin_386/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
+"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./root.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 "$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap
+mkdir -p "$GOBIN"/darwin_386/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/darwin_386/go
index 855f64641752b2437313f7eefa513d6af1073bd3..443b22c77d9c06e1ebd77f1f2a6c5220c7d98f39 100755 (executable)
@@ -490,7 +490,7 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/darwin_amd64/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
+"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./root.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 "$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
 mkdir -p "$GOBIN"/
index b6d20ce94b893335a3468aae391c5dc060ddf1a6..014df07614d0ccdf6eebf7603d723d4e38350edf 100755 (executable)
@@ -491,8 +491,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/freebsd_386/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
+"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./root.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 "$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap
+mkdir -p "$GOBIN"/freebsd_386/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/freebsd_386/go
index e069fcafd088da34835850f4be236dc926800e34..b9dd2be9cf0cb72498790075d96cd2a7b8609c40 100755 (executable)
@@ -490,8 +490,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/freebsd_amd64/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
+"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./root.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 "$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap
+mkdir -p "$GOBIN"/freebsd_amd64/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/freebsd_amd64/go
index 0d755e845f6afb25bf774f8d5a18daafe234c066..225c552678b93a0f3c7ccd3a2f6538cb8f27b9e2 100755 (executable)
@@ -491,8 +491,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/linux_386/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
+"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./root.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 "$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap
+mkdir -p "$GOBIN"/linux_386/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/linux_386/go
index 901252960587add377aae541b0062c5ce9d9972c..86f1fa2afa943c55039507c964cb06253f7627ec 100755 (executable)
@@ -490,8 +490,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/linux_amd64/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
+"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./root.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 "$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap
+mkdir -p "$GOBIN"/linux_amd64/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/linux_amd64/go
index 3a3570109ae54c40b1ffdbb99639a49e8deb8811..547af540b49dfe464d5affa24910535c70aaf23b 100755 (executable)
@@ -494,8 +494,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/linux_arm/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/5g -o "$WORK"/cmd/go/_obj/_go_.5 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
+"$GOROOT"/bin/go-tool/5g -o "$WORK"/cmd/go/_obj/_go_.5 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./root.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.5
 "$GOROOT"/bin/go-tool/5l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap
+mkdir -p "$GOBIN"/linux_arm/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/linux_arm/go
index 556aaed64d4ebc6864cd67a5585126bccc58191c..cf3cd83ece98107e5f8847fd0d40dd80374122db 100755 (executable)
@@ -491,8 +491,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/netbsd_386/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
+"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./root.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 "$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap
+mkdir -p "$GOBIN"/netbsd_386/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/netbsd_386/go
index 5b5a27a01cf4314666b94e4c0189bf37873a19ec..af3ef019d0a441751fe988c2c53eaf05ffd5b925 100755 (executable)
@@ -490,8 +490,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/netbsd_amd64/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
+"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./root.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 "$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap
+mkdir -p "$GOBIN"/netbsd_amd64/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/netbsd_amd64/go
index 92fbcbbddbd515f0382bbcc008c6479f7f1e0000..02e0a02c9d71bf6073e9d284b90dd4c98708dfdf 100755 (executable)
@@ -491,8 +491,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/openbsd_386/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
+"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./root.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 "$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap
+mkdir -p "$GOBIN"/openbsd_386/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/openbsd_386/go
index 0b3017bf66b372b830c45e98486c2c780e297184..7554508130d5eb2fbf9ccc015f3baffb76dbfc9c 100755 (executable)
@@ -490,8 +490,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/openbsd_amd64/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
+"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./root.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 "$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap
+mkdir -p "$GOBIN"/openbsd_amd64/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/openbsd_amd64/go
index f400b8eee5704aa1160220ee6c3226c2ccf311f3..a125d583c05d520045959f510bbcf267709b051d 100755 (executable)
@@ -491,8 +491,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/plan9_386/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
+"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./root.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 "$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/
-cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/go_bootstrap
+mkdir -p "$GOBIN"/plan9_386/
+cp "$WORK"/cmd/go/_obj/a.out "$GOBIN"/plan9_386/go
index 5ed83034d9a7d09a12fe4af98891b24dc56f61bc..bdb1edeef69606c7f2e02955b52fa269d170828f 100755 (executable)
@@ -493,8 +493,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/windows_386/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
+"$GOROOT"/bin/go-tool/8g -o "$WORK"/cmd/go/_obj/_go_.8 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./root.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.8
 "$GOROOT"/bin/go-tool/8l -o "$WORK"/cmd/go/_obj/a.out.exe -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/
-cp "$WORK"/cmd/go/_obj/a.out.exe "$GOBIN"/go_bootstrap.exe
+mkdir -p "$GOBIN"/windows_386/
+cp "$WORK"/cmd/go/_obj/a.out.exe "$GOBIN"/windows_386/go.exe
index 4607fde433560f50230d3371d6500fdd93e5adf6..8aa512b3b5cb996e7d54be995541d963af8f4bf4 100755 (executable)
@@ -492,8 +492,8 @@ cp "$WORK"/text/template.a "$GOROOT"/pkg/windows_amd64/text/template.a
 
 mkdir -p "$WORK"/cmd/go/_obj/
 cd "$GOROOT"/src/cmd/go
-"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
+"$GOROOT"/bin/go-tool/6g -o "$WORK"/cmd/go/_obj/_go_.6 -p cmd/go -I "$WORK" ./bootstrap.go ./build.go ./clean.go ./fix.go ./fmt.go ./get.go ./help.go ./list.go ./main.go ./pkg.go ./root.go ./run.go ./test.go ./testflag.go ./tool.go ./vcs.go ./version.go ./vet.go
 "$GOROOT"/bin/go-tool/pack grc "$WORK"/cmd/go.a "$WORK"/cmd/go/_obj/_go_.6
 "$GOROOT"/bin/go-tool/6l -o "$WORK"/cmd/go/_obj/a.out.exe -L "$WORK" "$WORK"/cmd/go.a
-mkdir -p "$GOBIN"/
-cp "$WORK"/cmd/go/_obj/a.out.exe "$GOBIN"/go_bootstrap.exe
+mkdir -p "$GOBIN"/windows_amd64/
+cp "$WORK"/cmd/go/_obj/a.out.exe "$GOBIN"/windows_amd64/go.exe
index 4930c2533d135a9efbb9e85c42eee408b796d7f5..96fcaf795b31ae21e44e8e59f7d96bf5173234fa 100755 (executable)
@@ -19,13 +19,20 @@ if [ "$1" != "--nopkg" ]; then
        rm -rf "$GOROOT"/pkg/${GOOS}_$GOARCH
 fi
 rm -f "$GOROOT"/lib/*.a
-for i in lib9 libbio libmach cmd pkg \
-       ../misc/cgo/gmp ../misc/cgo/stdio \
-       ../misc/cgo/life ../misc/cgo/test \
-       ../misc/dashboard/builder ../misc/goplay\
-       ../doc/codelab/wiki\
-       ../test/bench/shootout ../test/bench/garbage ../test/bench/go1
+for i in lib9 libbio libmach cmd
 do
        # Do not use gomake here. It may not be available.
        $MAKE -C "$GOROOT/src/$i" clean
 done
+
+if [ -x "$GOBIN/go" ]; then
+       go clean std || true  # go command might not know about clean
+       
+       # TODO: Make clean work in directories outside $GOPATH
+       true || go clean \
+               ../misc/cgo/gmp ../misc/cgo/stdio \
+               ../misc/cgo/life ../misc/cgo/test \
+               ../misc/dashboard/builder ../misc/goplay\
+               ../doc/codelab/wiki\
+               ../test/bench/shootout ../test/bench/garbage ../test/bench/go1
+fi
index 103977f32c77d3225ad70047a643f58f6f7ab4f3..31be2d12b75b2f36555db95bf0d875db11c8b204 100644 (file)
@@ -20,8 +20,7 @@ DIRS=\
        pack\
        prof\
        
-# Clean applies to all directories, even for other architectures or 
-# written in Go.
+# Clean applies to all directories, even for other architectures.
 CLEANDIRS=\
        $(DIRS)\
        5a\
@@ -36,12 +35,6 @@ CLEANDIRS=\
        8c\
        8g\
        8l\
-       cgo\
-       godoc\
-       fix\
-       gofmt\
-       vet\
-       yacc\
 
 install: $(patsubst %,%.install,$(DIRS))
 clean: $(patsubst %,%.clean,$(CLEANDIRS))
diff --git a/src/cmd/cgo/Makefile b/src/cmd/cgo/Makefile
deleted file mode 100644 (file)
index a3f034f..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=cgo
-GOFILES=\
-       ast.go\
-       gcc.go\
-       godefs.go\
-       main.go\
-       out.go\
-       util.go\
-
-include ../../Make.cmd
diff --git a/src/cmd/fix/Makefile b/src/cmd/fix/Makefile
deleted file mode 100644 (file)
index a03c7e4..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=gofix
-GOFILES=\
-       error.go\
-       filepath.go\
-       fix.go\
-       go1pkgrename.go\
-       googlecode.go\
-       hashsum.go\
-       hmacnew.go\
-       htmlerr.go\
-       httpfinalurl.go\
-       httpfs.go\
-       httpheaders.go\
-       httpserver.go\
-       httputil.go\
-       imagecolor.go\
-       imagenew.go\
-       imagetiled.go\
-       imageycbcr.go\
-       iocopyn.go\
-       main.go\
-       mapdelete.go\
-       math.go\
-       netdial.go\
-       netudpgroup.go\
-       oserrorstring.go\
-       osopen.go\
-       procattr.go\
-       reflect.go\
-       signal.go\
-       sorthelpers.go\
-       sortslice.go\
-       strconv.go\
-       stringssplit.go\
-       template.go\
-       timefileinfo.go\
-       typecheck.go\
-       url.go\
-       xmlapi.go\
-
-include ../../Make.tool
-
-test:
-       gotest
-
-testshort:
-       gotest -test.short
diff --git a/src/cmd/go/Makefile b/src/cmd/go/Makefile
deleted file mode 100644 (file)
index 3e19d2e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=go
-GOFILES=\
-       build.go\
-       fix.go\
-       get.go\
-       fmt.go\
-       help.go\
-       http.go\
-       list.go\
-       main.go\
-       pkg.go\
-       run.go\
-       test.go\
-       testflag.go\
-       tool.go\
-       version.go\
-       vet.go\
-       vcs.go\
-
-include ../../Make.cmd
diff --git a/src/cmd/godoc/Makefile b/src/cmd/godoc/Makefile
deleted file mode 100644 (file)
index a8cf5d6..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=godoc
-GOFILES=\
-       codewalk.go\
-       dirtrees.go\
-       filesystem.go\
-       format.go\
-       godoc.go\
-       httpzip.go\
-       index.go\
-       main.go\
-       mapping.go\
-       parser.go\
-       snippet.go\
-       spec.go\
-       throttle.go\
-       utils.go\
-       zip.go\
-
-include ../../Make.cmd
diff --git a/src/cmd/gofmt/Makefile b/src/cmd/gofmt/Makefile
deleted file mode 100644 (file)
index dc5b060..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=gofmt
-GOFILES=\
-       gofmt.go\
-       rewrite.go\
-       simplify.go\
-
-include ../../Make.cmd
-
-test: $(TARG)
-       ./test.sh
-
-testshort:
-       gotest -test.short
index a69f0e3beac864ef572a05bcf179e7397a970631..2a35d1ae37fc6d9c2b356699d94fe08108034157 100644 (file)
@@ -2,16 +2,6 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
-
-TARG=vet
-GOFILES=\
-       main.go\
-       method.go\
-       print.go\
-       structtag.go\
-
-include ../../Make.tool
-
-test testshort: $(TARG)
-       ../../../test/errchk $(TARG) -printfuncs='Warn:1,Warnf:1' print.go
+test testshort:
+       go build
+       ../../../test/errchk ./vet -printfuncs='Warn:1,Warnf:1' print.go
index 6ce9d54fbec403cea57e7340369b307443711b9d..4d84891e31b05c0e37e7611f096e2f1a78352a6b 100644 (file)
@@ -2,17 +2,6 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../Make.inc
-
-TARG=yacc
-GOFILES=\
-       yacc.go\
-
-include ../../Make.tool
-
-units: yacc units.y
-       ./yacc -p units_ units.y
-       $(GC) $(GCFLAGS) $(GCIMPORTS) y.go
-       $(LD) -o units y.$O
-
-CLEANFILES += units y.go y.output
+units: yacc.go units.y
+       go run yacc.go -p units_ units.y
+       go build -o units y.go
index 487727b0649441495039e3a008fc22a990d1ac66..3ae4f256de7695393970d3afbad4440788ef098d 100644 (file)
@@ -3,10 +3,6 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-# Disable use of makefiles during build.
-# TODO: Remove this and the makefiles.
-USE_GO_TOOL=true
-
 # If set to a Windows-style path convert to an MSYS-Unix 
 # one using the built-in shell commands.   
 if [[ "$GOROOT" == *:* ]]; then
index b7b20bfd5baafa34f696e14c88ff05c297f2237e..2fdcb3b247972ce7cfb74ee148fca1c235f9d223 100755 (executable)
@@ -49,13 +49,15 @@ export CC
 sed -e "s|@CC@|$CC|" < "$GOROOT"/src/quietgcc.bash > "$GOBIN"/quietgcc
 chmod +x "$GOBIN"/quietgcc
 
+export GOMAKE="$GOROOT"/bin/go-tool/make
 rm -f "$GOBIN"/gomake
+rm -f "$GOMAKE"
 (
        echo '#!/bin/sh'
        echo 'export GOROOT=${GOROOT:-'$GOROOT_FINAL'}'
        echo 'exec '$MAKE' "$@"'
-) >"$GOBIN"/gomake
-chmod +x "$GOBIN"/gomake
+) >"$GOMAKE"
+chmod +x "$GOMAKE"
 
 # on Fedora 16 the selinux filesystem is mounted at /sys/fs/selinux,
 # so loop through the possible selinux mount points
@@ -78,18 +80,13 @@ do
        fi
 done
 
-$USE_GO_TOOL ||
-(
-       cd "$GOROOT"/src/pkg;
-       bash deps.bash  # do this here so clean.bash will work in the pkg directory
-) || exit 1
 bash "$GOROOT"/src/clean.bash
 
 # pkg builds runtime/cgo and the Go programs in cmd.
 for i in lib9 libbio libmach cmd
 do
        echo; echo; echo %%%% making $i %%%%; echo
-       gomake -C $i install
+       "$GOMAKE" -C $i install
 done
 
 echo; echo; echo %%%% making runtime generated files %%%%; echo
@@ -97,36 +94,33 @@ echo; echo; echo %%%% making runtime generated files %%%%; echo
 (
        cd "$GOROOT"/src/pkg/runtime
        ./autogen.sh
-       gomake install; gomake clean # copy runtime.h to pkg directory
+       "$GOMAKE" install; "$GOMAKE" clean # copy runtime.h to pkg directory
 ) || exit 1
 
-if $USE_GO_TOOL; then
-       echo
-       echo '# Building go_bootstrap command from bootstrap script.'
-       if ! ./buildscript/${GOOS}_$GOARCH.sh; then
-               echo '# Bootstrap script failed.'
-               if [ ! -x "$GOBIN/go" ]; then
-                       exit 1
-               fi
-               echo '# Regenerating bootstrap script using pre-existing go binary.'
-               ./buildscript.sh
-               ./buildscript/${GOOS}_$GOARCH.sh
+echo
+echo '# Building go_bootstrap command from bootstrap script.'
+if ! ./buildscript/${GOOS}_$GOARCH.sh; then
+       echo '# Bootstrap script failed.'
+       if [ ! -x "$GOBIN/go" ]; then
+               exit 1
        fi
+       echo '# Regenerating bootstrap script using pre-existing go binary.'
+       ./buildscript.sh
+       ./buildscript/${GOOS}_$GOARCH.sh
+fi
 
-       echo '# Building Go code.'
-       go_bootstrap install -a -v std
-       rm -f "$GOBIN/go_bootstrap"
+# Clean what clean.bash couldn't.
+go_bootstrap clean std
 
-else
-       echo; echo; echo %%%% making pkg %%%%; echo
-       gomake -C pkg install
-fi
+echo '# Building Go code.'
+go_bootstrap install -a -v std
+rm -f "$GOBIN/go_bootstrap"
 
 # Print post-install messages.
 # Implemented as a function so that all.bash can repeat the output
 # after run.bash finishes running all the tests.
 installed() {
-       eval $(gomake --no-print-directory -f Make.inc go-env)
+       eval $("$GOMAKE" --no-print-directory -f Make.inc go-env)
        echo
        echo ---
        echo Installed Go for $GOOS/$GOARCH in "$GOROOT".
@@ -137,7 +131,6 @@ installed() {
        *)
                echo '***' "You need to add $GOBIN to your "'$PATH.' '***'
        esac
-       echo The compiler is $GC.
        if [ "$(uname)" = "Darwin" ]; then
                echo
                echo On OS X the debuggers must be installed setgrp procmod.
diff --git a/src/pkg/Makefile b/src/pkg/Makefile
deleted file mode 100644 (file)
index cd9776d..0000000
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# After editing the DIRS= list or adding imports to any Go files
-# in any of those directories, run:
-#
-#      ./deps.bash
-#
-# to rebuild the dependency information in Make.deps.
-
-include ../Make.inc
-
-all: install
-
-DIRS=\
-       archive/tar\
-       archive/zip\
-       bufio\
-       bytes\
-       compress/bzip2\
-       compress/flate\
-       compress/gzip\
-       compress/lzw \
-       compress/zlib\
-       container/heap\
-       container/list\
-       container/ring\
-       crypto\
-       crypto/aes\
-       crypto/cipher\
-       crypto/des\
-       crypto/dsa\
-       crypto/ecdsa\
-       crypto/elliptic\
-       crypto/hmac\
-       crypto/md5\
-       crypto/rand\
-       crypto/rc4\
-       crypto/rsa\
-       crypto/sha1\
-       crypto/sha256\
-       crypto/sha512\
-       crypto/subtle\
-       crypto/tls\
-       crypto/x509\
-       crypto/x509/pkix\
-       database/sql\
-       database/sql/driver\
-       debug/dwarf\
-       debug/macho\
-       debug/elf\
-       debug/gosym\
-       debug/pe\
-       encoding/ascii85\
-       encoding/asn1\
-       encoding/base32\
-       encoding/base64\
-       encoding/binary\
-       encoding/csv\
-       encoding/gob\
-       encoding/hex\
-       encoding/json\
-       encoding/pem\
-       encoding/xml\
-       errors\
-       exp/ebnf\
-       exp/ebnflint\
-       exp/gotype\
-       exp/html\
-       exp/norm\
-       exp/terminal\
-       exp/types\
-       expvar\
-       flag\
-       fmt\
-       go/ast\
-       go/build\
-       go/doc\
-       go/parser\
-       go/printer\
-       go/scanner\
-       go/token\
-       hash\
-       hash/adler32\
-       hash/crc32\
-       hash/crc64\
-       hash/fnv\
-       html\
-       html/template\
-       image\
-       image/color\
-       image/draw\
-       image/gif\
-       image/jpeg\
-       image/png\
-       index/suffixarray\
-       io\
-       io/ioutil\
-       log\
-       log/syslog\
-       math\
-       math/big\
-       math/cmplx\
-       math/rand\
-       mime\
-       mime/multipart\
-       net\
-       net/http\
-       net/http/cgi\
-       net/http/fcgi\
-       net/http/pprof\
-       net/http/httptest\
-       net/http/httputil\
-       net/mail\
-       net/rpc\
-       net/rpc/jsonrpc\
-       net/smtp\
-       net/textproto\
-       net/url\
-       old/netchan\
-       old/regexp\
-       old/template\
-       os\
-       os/exec\
-       os/signal\
-       os/user\
-       path\
-       path/filepath\
-       reflect\
-       regexp\
-       regexp/syntax\
-       runtime\
-       runtime/cgo\
-       runtime/debug\
-       runtime/pprof\
-       sort\
-       strconv\
-       strings\
-       sync\
-       sync/atomic\
-       syscall\
-       testing\
-       testing/iotest\
-       testing/quick\
-       testing/script\
-       text/scanner\
-       text/tabwriter\
-       text/template\
-       text/template/parse\
-       time\
-       unicode\
-       unicode/utf16\
-       unicode/utf8\
-       ../cmd/cgo\
-       ../cmd/godoc\
-       ../cmd/fix\
-       ../cmd/gofmt\
-       ../cmd/vet\
-       ../cmd/yacc\
-
-ifeq ($(GOOS),linux)
-DIRS+=\
-       exp/inotify\
-
-endif
-
-ifeq ($(GOOS),plan9)
-NOPLAN9BUILD=\
-       os/signal\
-
-DIRS:=$(filter-out $(NOPLAN9BUILD),$(DIRS))
-endif
-
-NOTEST+=\
-       crypto\
-       crypto/openpgp/errors\
-       crypto/x509/pkix\
-       exp/ebnflint\
-       go/doc\
-       hash\
-       image/gif\
-       net/http/pprof\
-       net/http/httptest\
-       runtime/cgo\
-       syscall\
-       testing\
-       testing/iotest\
-       ../cmd/cgo\
-       ../cmd/godoc\
-       ../cmd/yacc\
-
-NOBENCH+=\
-
-# Disable tests that windows cannot run yet.
-ifeq ($(GOOS),windows)
-NOTEST+=os/signal    # no signals
-NOTEST+=syslog       # no network
-endif
-
-TEST=\
-       $(filter-out $(NOTEST),$(DIRS))
-
-BENCH=\
-       $(filter-out $(NOBENCH),$(TEST))
-
-CRAP:
-       echo $(DIRS)
-
-clean.dirs: $(addsuffix .clean, $(DIRS))
-install.dirs: $(addsuffix .install, $(DIRS))
-nuke.dirs: $(addsuffix .nuke, $(DIRS))
-test.dirs: $(addsuffix .test, $(TEST))
-testshort.dirs: $(addsuffix .testshort, $(TEST))
-bench.dirs: $(addsuffix .bench, $(BENCH))
-
-%.clean:
-       +$(MAKE) -C $* clean
-
-%.install:
-       +@echo install $*
-       +@$(MAKE) -C $* install.clean >$*/build.out 2>&1 || (echo INSTALL FAIL $*; cat $*/build.out; exit 1)
-
-%.nuke:
-       +$(MAKE) -C $* nuke
-
-%.test:
-       +@echo test $*
-       +@$(MAKE) -C $* test.clean >$*/test.out 2>&1 || (echo TEST FAIL $*; cat $*/test.out; exit 1)
-
-%.testshort:
-       +@echo test $*
-       +@$(MAKE) -C $* testshort.clean >$*/test.out 2>&1 || (echo TEST FAIL $*; cat $*/test.out; exit 1)
-
-%.bench:
-       +$(MAKE) -C $* bench    
-
-clean: clean.dirs
-
-install: install.dirs
-
-test:  test.dirs
-
-testshort: testshort.dirs
-
-bench: bench.dirs ../../test/garbage.bench
-
-nuke: nuke.dirs
-       rm -rf "$(GOROOT)"/pkg/*
-
-deps:
-       ./deps.bash
-
-echo-dirs:
-       @echo $(DIRS)
-
--include Make.deps
-
-runtime/cgo.install: ../cmd/cgo.install
diff --git a/src/pkg/archive/tar/Makefile b/src/pkg/archive/tar/Makefile
deleted file mode 100644 (file)
index 8897e88..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=archive/tar
-GOFILES=\
-       common.go\
-       reader.go\
-       writer.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/archive/zip/Makefile b/src/pkg/archive/zip/Makefile
deleted file mode 100644 (file)
index 9071690..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2010 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=archive/zip
-GOFILES=\
-       reader.go\
-       struct.go\
-       writer.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/bufio/Makefile b/src/pkg/bufio/Makefile
deleted file mode 100644 (file)
index 85430e8..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=bufio
-GOFILES=\
-       bufio.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/bytes/Makefile b/src/pkg/bytes/Makefile
deleted file mode 100644 (file)
index 03395c7..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=bytes
-GOFILES=\
-       buffer.go\
-       bytes.go\
-       bytes_decl.go\
-
-OFILES=\
-       asm_$(GOARCH).$O\
-
-include ../../Make.pkg
diff --git a/src/pkg/compress/bzip2/Makefile b/src/pkg/compress/bzip2/Makefile
deleted file mode 100644 (file)
index a4bceef..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=compress/bzip2
-GOFILES=\
-       bit_reader.go\
-       bzip2.go\
-       huffman.go\
-       move_to_front.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/compress/flate/Makefile b/src/pkg/compress/flate/Makefile
deleted file mode 100644 (file)
index 04fcb6b..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=compress/flate
-GOFILES=\
-       deflate.go\
-       huffman_bit_writer.go\
-       huffman_code.go\
-       inflate.go\
-       reverse_bits.go\
-       token.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/compress/gzip/Makefile b/src/pkg/compress/gzip/Makefile
deleted file mode 100644 (file)
index b671fc7..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=compress/gzip
-GOFILES=\
-       gunzip.go\
-       gzip.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/compress/lzw/Makefile b/src/pkg/compress/lzw/Makefile
deleted file mode 100644 (file)
index 28f5e6a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=compress/lzw
-GOFILES=\
-       reader.go\
-       writer.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/compress/zlib/Makefile b/src/pkg/compress/zlib/Makefile
deleted file mode 100644 (file)
index 791072d..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=compress/zlib
-GOFILES=\
-       reader.go\
-       writer.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/container/heap/Makefile b/src/pkg/container/heap/Makefile
deleted file mode 100644 (file)
index 4291d11..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=container/heap
-GOFILES=\
-       heap.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/container/list/Makefile b/src/pkg/container/list/Makefile
deleted file mode 100644 (file)
index 7fcd5f9..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=container/list
-GOFILES=\
-       list.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/container/ring/Makefile b/src/pkg/container/ring/Makefile
deleted file mode 100644 (file)
index fb09007..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=container/ring
-GOFILES=\
-       ring.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/Makefile b/src/pkg/crypto/Makefile
deleted file mode 100644 (file)
index 738a520..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=crypto
-GOFILES=\
-       crypto.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/crypto/aes/Makefile b/src/pkg/crypto/aes/Makefile
deleted file mode 100644 (file)
index 9dc846e..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/aes
-GOFILES=\
-       block.go\
-       cipher.go\
-       const.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/cipher/Makefile b/src/pkg/crypto/cipher/Makefile
deleted file mode 100644 (file)
index 8f61cf2..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2010 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/cipher
-GOFILES=\
-       cbc.go\
-       cfb.go\
-       cipher.go\
-       ctr.go\
-       io.go\
-       ocfb.go\
-       ofb.go
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/des/Makefile b/src/pkg/crypto/des/Makefile
deleted file mode 100644 (file)
index 94b0fc0..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2010 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/des
-GOFILES=\
-       block.go\
-       cipher.go\
-       const.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/dsa/Makefile b/src/pkg/crypto/dsa/Makefile
deleted file mode 100644 (file)
index fa89d4a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/dsa
-GOFILES=\
-       dsa.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/ecdsa/Makefile b/src/pkg/crypto/ecdsa/Makefile
deleted file mode 100644 (file)
index 0af24c2..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/ecdsa
-GOFILES=\
-       ecdsa.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/elliptic/Makefile b/src/pkg/crypto/elliptic/Makefile
deleted file mode 100644 (file)
index b38af4d..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2010 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/elliptic
-GOFILES=\
-       elliptic.go\
-       p224.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/hmac/Makefile b/src/pkg/crypto/hmac/Makefile
deleted file mode 100644 (file)
index cc69abf..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/hmac
-GOFILES=\
-       hmac.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/md5/Makefile b/src/pkg/crypto/md5/Makefile
deleted file mode 100644 (file)
index 5cde3e6..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/md5
-GOFILES=\
-       md5.go\
-       md5block.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/rand/Makefile b/src/pkg/crypto/rand/Makefile
deleted file mode 100644 (file)
index d1a3d45..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2010 The Go Authors.  All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/rand
-
-GOFILES=\
-       rand.go\
-       util.go\
-
-GOFILES_freebsd=\
-       rand_unix.go\
-
-GOFILES_darwin=\
-       rand_unix.go\
-
-GOFILES_linux=\
-       rand_unix.go\
-
-GOFILES_openbsd=\
-       rand_unix.go\
-
-GOFILES_windows=\
-       rand_windows.go\
-
-GOFILES+=$(GOFILES_$(GOOS))
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/rc4/Makefile b/src/pkg/crypto/rc4/Makefile
deleted file mode 100644 (file)
index 50a3b79..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/rc4
-GOFILES=\
-       rc4.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/rsa/Makefile b/src/pkg/crypto/rsa/Makefile
deleted file mode 100644 (file)
index ff26ca6..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/rsa
-GOFILES=\
-       rsa.go\
-       pkcs1v15.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/sha1/Makefile b/src/pkg/crypto/sha1/Makefile
deleted file mode 100644 (file)
index 81ac38c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/sha1
-GOFILES=\
-       sha1.go\
-       sha1block.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/sha256/Makefile b/src/pkg/crypto/sha256/Makefile
deleted file mode 100644 (file)
index 97fe4d8..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/sha256
-GOFILES=\
-       sha256.go\
-       sha256block.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/sha512/Makefile b/src/pkg/crypto/sha512/Makefile
deleted file mode 100644 (file)
index 2f7633f..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/sha512
-GOFILES=\
-       sha512.go\
-       sha512block.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/subtle/Makefile b/src/pkg/crypto/subtle/Makefile
deleted file mode 100644 (file)
index 08d8bbf..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/subtle
-GOFILES=\
-       constant_time.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/tls/Makefile b/src/pkg/crypto/tls/Makefile
deleted file mode 100644 (file)
index 5cda149..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/tls
-GOFILES=\
-       alert.go\
-       cipher_suites.go\
-       common.go\
-       conn.go\
-       handshake_client.go\
-       handshake_messages.go\
-       handshake_server.go\
-       key_agreement.go\
-       prf.go\
-       tls.go\
-
-ifeq ($(CGO_ENABLED),1)
-CGOFILES_darwin=\
-       root_darwin.go
-else
-GOFILES_darwin+=root_stub.go
-endif
-
-GOFILES_freebsd+=root_unix.go
-GOFILES_linux+=root_unix.go
-GOFILES_netbsd+=root_unix.go
-GOFILES_openbsd+=root_unix.go
-GOFILES_plan9+=root_stub.go
-GOFILES_windows+=root_windows.go
-
-GOFILES+=$(GOFILES_$(GOOS))
-ifneq ($(CGOFILES_$(GOOS)),)
-CGOFILES+=$(CGOFILES_$(GOOS))
-endif
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/x509/Makefile b/src/pkg/crypto/x509/Makefile
deleted file mode 100644 (file)
index 91d1052..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=crypto/x509
-GOFILES=\
-       cert_pool.go\
-       pkcs1.go\
-       pkcs8.go\
-       verify.go\
-       x509.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/crypto/x509/pkix/Makefile b/src/pkg/crypto/x509/pkix/Makefile
deleted file mode 100644 (file)
index e29b74c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../../Make.inc
-
-TARG=crypto/x509/pkix
-GOFILES=\
-       pkix.go\
-
-include ../../../../Make.pkg
diff --git a/src/pkg/database/sql/Makefile b/src/pkg/database/sql/Makefile
deleted file mode 100644 (file)
index b8dd59a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=database/sql
-GOFILES=\
-       convert.go\
-       sql.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/database/sql/driver/Makefile b/src/pkg/database/sql/driver/Makefile
deleted file mode 100644 (file)
index 564aaa6..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../../Make.inc
-
-TARG=database/sql/driver
-GOFILES=\
-       driver.go\
-       types.go\
-
-include ../../../../Make.pkg
diff --git a/src/pkg/debug/dwarf/Makefile b/src/pkg/debug/dwarf/Makefile
deleted file mode 100644 (file)
index c420318..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2009 The Go Authors.  All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=debug/dwarf
-GOFILES=\
-       buf.go\
-       const.go\
-       entry.go\
-       open.go\
-       type.go\
-       unit.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/debug/elf/Makefile b/src/pkg/debug/elf/Makefile
deleted file mode 100644 (file)
index dd431f6..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors.  All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=debug/elf
-GOFILES=\
-       elf.go\
-       file.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/debug/macho/Makefile b/src/pkg/debug/macho/Makefile
deleted file mode 100644 (file)
index 5fbbf1e..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors.  All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=debug/macho
-GOFILES=\
-       macho.go\
-       file.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/debug/pe/Makefile b/src/pkg/debug/pe/Makefile
deleted file mode 100644 (file)
index 998e6a4..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors.  All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=debug/pe
-GOFILES=\
-       pe.go\
-       file.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/encoding/ascii85/Makefile b/src/pkg/encoding/ascii85/Makefile
deleted file mode 100644 (file)
index 412383e..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=encoding/ascii85
-GOFILES=\
-       ascii85.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/encoding/asn1/Makefile b/src/pkg/encoding/asn1/Makefile
deleted file mode 100644 (file)
index 1c046dc..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=encoding/asn1
-GOFILES=\
-       asn1.go\
-       common.go\
-       marshal.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/encoding/base32/Makefile b/src/pkg/encoding/base32/Makefile
deleted file mode 100644 (file)
index c0e85b6..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include $(GOROOT)/src/Make.inc
-
-TARG=encoding/base32
-GOFILES=\
-       base32.go\
-
-include $(GOROOT)/src/Make.pkg
diff --git a/src/pkg/encoding/base64/Makefile b/src/pkg/encoding/base64/Makefile
deleted file mode 100644 (file)
index 2f54ed8..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=encoding/base64
-GOFILES=\
-       base64.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/encoding/binary/Makefile b/src/pkg/encoding/binary/Makefile
deleted file mode 100644 (file)
index 3246f5a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors.  All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=encoding/binary
-GOFILES=\
-       binary.go\
-        varint.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/encoding/csv/Makefile b/src/pkg/encoding/csv/Makefile
deleted file mode 100644 (file)
index 9e04c5b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=encoding/csv
-GOFILES=\
-       reader.go\
-       writer.go\
-
-include ../../../Make.pkg
index 3847edb20b5f98f7bb803e599877b8a5119d63ff..3de845efcdfe83bc51746b009e6595f49ec5cf7b 100644 (file)
@@ -2,24 +2,8 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../Make.inc
+# Help for debugging.
+dump:  dump.go
+       go clean -i  # remove installed copy
+       go build -t gob-debug -o dump dump.go
 
-TARG=encoding/gob
-GOFILES=\
-       decode.go\
-       decoder.go\
-       doc.go\
-       encode.go\
-       encoder.go\
-       error.go\
-       type.go\
-
-include ../../../Make.pkg
-
-# Help for debugging. Requires adding debug.go to the gob package as well.
-
-dump:  dump.$O
-       $(LD) -o dump $<
-
-dump.$O:       dump.go
-       $(GC) $(GCFLAGS) $(GCIMPORTS) $<
index 6dc7fc9aca0604d523ee262ce55328fe6004fad0..b54ef46f52c29b72b1c87e016b7b7f149edc4dd5 100644 (file)
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// Delete the next line to include this file in the gob package.
-// +build ignore
+// Delete the next line to include in the gob package.
+// +build gob-debug
 
 package gob
 
diff --git a/src/pkg/encoding/hex/Makefile b/src/pkg/encoding/hex/Makefile
deleted file mode 100644 (file)
index 22049f4..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=encoding/hex
-GOFILES=\
-       hex.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/encoding/json/Makefile b/src/pkg/encoding/json/Makefile
deleted file mode 100644 (file)
index 37223e7..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=encoding/json
-GOFILES=\
-       decode.go\
-       encode.go\
-       indent.go\
-       scanner.go\
-       stream.go\
-       tags.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/encoding/pem/Makefile b/src/pkg/encoding/pem/Makefile
deleted file mode 100644 (file)
index 5276703..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=encoding/pem
-GOFILES=\
-       pem.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/encoding/xml/Makefile b/src/pkg/encoding/xml/Makefile
deleted file mode 100644 (file)
index ca84c21..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2009 The Go Authors.  All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=encoding/xml
-
-GOFILES=\
-       marshal.go\
-       read.go\
-       typeinfo.go\
-       xml.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/errors/Makefile b/src/pkg/errors/Makefile
deleted file mode 100644 (file)
index 05b4de5..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=errors
-GOFILES=\
-       errors.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/exp/ebnf/Makefile b/src/pkg/exp/ebnf/Makefile
deleted file mode 100644 (file)
index 844de67..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=exp/ebnf
-GOFILES=\
-       ebnf.go\
-       parser.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/exp/ebnflint/Makefile b/src/pkg/exp/ebnflint/Makefile
deleted file mode 100644 (file)
index 2057b07..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=ebnflint
-GOFILES=\
-       ebnflint.go\
-
-include ../../../Make.cmd
-
-test: $(TARG)
-       $(TARG) -start="SourceFile" "$(GOROOT)"/doc/go_spec.html
-
diff --git a/src/pkg/exp/gotype/Makefile b/src/pkg/exp/gotype/Makefile
deleted file mode 100644 (file)
index 230242c..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=gotype
-GOFILES=\
-       gotype.go\
-
-include ../../../Make.cmd
-
-test:
-       gotest
-
-testshort:
-       gotest -test.short
diff --git a/src/pkg/exp/html/Makefile b/src/pkg/exp/html/Makefile
deleted file mode 100644 (file)
index 3ba6a0d..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2010 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=html
-GOFILES=\
-       const.go\
-       doc.go\
-       doctype.go\
-       entity.go\
-       escape.go\
-       foreign.go\
-       node.go\
-       parse.go\
-       render.go\
-       token.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/exp/inotify/Makefile b/src/pkg/exp/inotify/Makefile
deleted file mode 100644 (file)
index 1e822fb..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2010 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=exp/inotify
-
-GOFILES_linux=\
-       inotify_linux.go\
-
-GOFILES+=$(GOFILES_$(GOOS))
-
-include ../../../Make.pkg
index b4faa249aca60d69493e136669bfd9bdf4b9ad83..f278eb02f90e91a2a7a7ceb2e08cb66487904583 100644 (file)
@@ -2,33 +2,14 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../Make.inc
-
-TARG=exp/norm
-GOFILES=\
-       composition.go\
-       input.go\
-       forminfo.go\
-       normalize.go\
-       readwriter.go\
-       tables.go\
-       trie.go\
-
-include ../../../Make.pkg
-
-CLEANFILES+=maketables maketesttables
-
 maketables: maketables.go triegen.go
-       $(GC) $(GCFLAGS) $(GCIMPORTS) maketables.go triegen.go
-       $(LD) -o maketables maketables.$O
+       go build $^
 
 maketesttables: maketesttables.go triegen.go
-       $(GC) $(GCFLAGS) $(GCIMPORTS) maketesttables.go triegen.go
-       $(LD) -o maketesttables maketesttables.$O
+       go build $^
 
 normregtest: normregtest.go
-       $(GC) $(GCFLAGS) $(GCIMPORTS) normregtest.go
-       $(LD) -o normregtest normregtest.$O
+       go build $^
 
 tables:        maketables
        ./maketables > tables.go
@@ -38,10 +19,6 @@ trietesttables: maketesttables
        ./maketesttables > triedata_test.go
        gofmt -w triedata_test.go
 
-# Build (but do not run) maketables during testing,
-# just to make sure it still compiles.
-testshort: maketables maketesttables
-
 # Downloads from www.unicode.org, so not part
 # of standard test scripts.
 test: testtables regtest
diff --git a/src/pkg/exp/proxy/Makefile b/src/pkg/exp/proxy/Makefile
deleted file mode 100644 (file)
index 7067de1..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=exp/proxy
-GOFILES=\
-       direct.go\
-       per_host.go\
-       proxy.go\
-       socks5.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/exp/terminal/Makefile b/src/pkg/exp/terminal/Makefile
deleted file mode 100644 (file)
index 7f702ef..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=exp/terminal
-GOFILES=\
-       terminal.go\
-
-ifeq ($(GOOS),linux)
-GOFILES+=\
-       util.go
-endif
-
-include ../../../Make.pkg
diff --git a/src/pkg/exp/types/Makefile b/src/pkg/exp/types/Makefile
deleted file mode 100644 (file)
index e8fec9f..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2010 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=exp/types
-GOFILES=\
-       check.go\
-       const.go\
-       exportdata.go\
-       gcimporter.go\
-       types.go\
-       universe.go\
-
-include ../../../Make.pkg
-
-CLEANFILES+=testdata/exports.[$(OS)]
diff --git a/src/pkg/exp/utf8string/Makefile b/src/pkg/exp/utf8string/Makefile
deleted file mode 100644 (file)
index 49c1928..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=exp/utf8string
-GOFILES=\
-       string.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/exp/winfsnotify/Makefile b/src/pkg/exp/winfsnotify/Makefile
deleted file mode 100644 (file)
index f0fe096..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=exp/winfsnotify
-GOFILES=\
-       winfsnotify.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/expvar/Makefile b/src/pkg/expvar/Makefile
deleted file mode 100644 (file)
index 5619630..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=expvar
-GOFILES=\
-       expvar.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/flag/Makefile b/src/pkg/flag/Makefile
deleted file mode 100644 (file)
index 3408ca4..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=flag
-GOFILES=\
-       flag.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/fmt/Makefile b/src/pkg/fmt/Makefile
deleted file mode 100644 (file)
index 44b48bc..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=fmt
-GOFILES=\
-       doc.go\
-       format.go\
-       print.go\
-       scan.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/go/ast/Makefile b/src/pkg/go/ast/Makefile
deleted file mode 100644 (file)
index 30c386c..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=go/ast
-GOFILES=\
-       ast.go\
-       filter.go\
-       import.go\
-       print.go\
-       resolve.go\
-       scope.go\
-       walk.go\
-
-include ../../../Make.pkg
index 68c731749a3edf7d035e4d0a4615816d9f3e0bbe..c7ef6542e50913c3befe62a3dd2373c255e3570d 100644 (file)
@@ -2,19 +2,6 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../Make.inc
-
-TARG=go/build
-GOFILES=\
-       build.go\
-       dir.go\
-       path.go\
-       syslist.go\
-
-CLEANFILES+=pkgtest/_obj cmdtest/_obj cgotest/_obj
-
-include ../../../Make.pkg
-
 syslist.go: ../../../Make.inc Makefile
        echo '// Generated automatically by make.' >$@
        echo 'package build' >>$@
index ac2eeb96272d98334353ba0eded4799e55c73cee..ca4948f91c2554737fd2ce7c1130a4eb7ac2f286 100644 (file)
@@ -2,21 +2,6 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../Make.inc
-
-TARG=go/doc
-GOFILES=\
-       comment.go\
-       doc.go\
-       example.go\
-       exports.go\
-       filter.go\
-       reader.go\
-
-include ../../../Make.pkg
-
 # Script to test heading detection heuristic
-CLEANFILES+=headscan
 headscan: headscan.go
-       $(GC) $(GCFLAGS) $(GCIMPORTS) headscan.go
-       $(LD) -o headscan headscan.$(O)
+       go build headscan.go
diff --git a/src/pkg/go/parser/Makefile b/src/pkg/go/parser/Makefile
deleted file mode 100644 (file)
index d301f41..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=go/parser
-GOFILES=\
-       interface.go\
-       parser.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/go/printer/Makefile b/src/pkg/go/printer/Makefile
deleted file mode 100644 (file)
index 6a71efc..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=go/printer
-GOFILES=\
-       printer.go\
-       nodes.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/go/scanner/Makefile b/src/pkg/go/scanner/Makefile
deleted file mode 100644 (file)
index 453faac..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=go/scanner
-GOFILES=\
-       errors.go\
-       scanner.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/go/token/Makefile b/src/pkg/go/token/Makefile
deleted file mode 100644 (file)
index b13b044..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=go/token
-GOFILES=\
-       position.go\
-       serialize.go\
-       token.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/hash/Makefile b/src/pkg/hash/Makefile
deleted file mode 100644 (file)
index 56071cb..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=hash
-GOFILES=\
-       hash.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/hash/adler32/Makefile b/src/pkg/hash/adler32/Makefile
deleted file mode 100644 (file)
index 38ce537..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=hash/adler32
-GOFILES=\
-       adler32.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/hash/crc32/Makefile b/src/pkg/hash/crc32/Makefile
deleted file mode 100644 (file)
index af8a64c..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=hash/crc32
-
-ifeq ($(GOARCH), amd64)
-       ARCH_GOFILES=crc32_amd64.go
-       OFILES=crc32_amd64.6
-else
-       ARCH_GOFILES=crc32_generic.go
-endif
-
-GOFILES=\
-       crc32.go\
-       $(ARCH_GOFILES)
-
-include ../../../Make.pkg
diff --git a/src/pkg/hash/crc64/Makefile b/src/pkg/hash/crc64/Makefile
deleted file mode 100644 (file)
index 5f6c3de..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=hash/crc64
-GOFILES=\
-       crc64.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/hash/fnv/Makefile b/src/pkg/hash/fnv/Makefile
deleted file mode 100644 (file)
index 4c8a4ec..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=hash/fnv
-GOFILES=\
-       fnv.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/html/Makefile b/src/pkg/html/Makefile
deleted file mode 100644 (file)
index 1b18358..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2010 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=html
-GOFILES=\
-       entity.go\
-       escape.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/html/template/Makefile b/src/pkg/html/template/Makefile
deleted file mode 100644 (file)
index d27601a..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=html/template
-GOFILES=\
-       attr.go\
-       clone.go\
-       content.go\
-       context.go\
-       css.go\
-       doc.go\
-       error.go\
-       escape.go\
-       html.go\
-       js.go\
-       template.go\
-       transition.go\
-       url.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/image/Makefile b/src/pkg/image/Makefile
deleted file mode 100644 (file)
index 7c995d9..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=image
-GOFILES=\
-       format.go\
-       geom.go\
-       image.go\
-       names.go\
-       ycbcr.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/image/color/Makefile b/src/pkg/image/color/Makefile
deleted file mode 100644 (file)
index 94b4e39..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=image/color
-GOFILES=\
-       color.go\
-       ycbcr.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/image/draw/Makefile b/src/pkg/image/draw/Makefile
deleted file mode 100644 (file)
index 2ba6e7b..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors.  All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=image/draw
-GOFILES=\
-       draw.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/image/gif/Makefile b/src/pkg/image/gif/Makefile
deleted file mode 100644 (file)
index e89a713..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=image/gif
-GOFILES=\
-       reader.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/image/jpeg/Makefile b/src/pkg/image/jpeg/Makefile
deleted file mode 100644 (file)
index d9d830f..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=image/jpeg
-GOFILES=\
-       fdct.go\
-       huffman.go\
-       idct.go\
-       reader.go\
-       writer.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/image/png/Makefile b/src/pkg/image/png/Makefile
deleted file mode 100644 (file)
index 4101f77..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=image/png
-GOFILES=\
-       reader.go\
-       writer.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/index/suffixarray/Makefile b/src/pkg/index/suffixarray/Makefile
deleted file mode 100644 (file)
index 297c427..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2010 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=index/suffixarray
-GOFILES=\
-       qsufsort.go\
-       suffixarray.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/io/Makefile b/src/pkg/io/Makefile
deleted file mode 100644 (file)
index 9786002..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=io
-GOFILES=\
-       io.go\
-       multi.go\
-       pipe.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/io/ioutil/Makefile b/src/pkg/io/ioutil/Makefile
deleted file mode 100644 (file)
index d406d4b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=io/ioutil
-GOFILES=\
-       ioutil.go\
-       tempfile.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/log/Makefile b/src/pkg/log/Makefile
deleted file mode 100644 (file)
index da72216..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=log
-GOFILES=\
-       log.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/log/syslog/Makefile b/src/pkg/log/syslog/Makefile
deleted file mode 100644 (file)
index 225307c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=log/syslog
-GOFILES=\
-       syslog.go\
-       syslog_unix.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/math/Makefile b/src/pkg/math/Makefile
deleted file mode 100644 (file)
index d70cba7..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=math
-
-OFILES=\
-       abs_$(GOARCH).$O\
-       asin_$(GOARCH).$O\
-       atan_$(GOARCH).$O\
-       atan2_$(GOARCH).$O\
-       dim_$(GOARCH).$O\
-       exp_$(GOARCH).$O\
-       exp2_$(GOARCH).$O\
-       expm1_$(GOARCH).$O\
-       floor_$(GOARCH).$O\
-       frexp_$(GOARCH).$O\
-       hypot_$(GOARCH).$O\
-       ldexp_$(GOARCH).$O\
-       log_$(GOARCH).$O\
-       log10_$(GOARCH).$O\
-       log1p_$(GOARCH).$O\
-       mod_$(GOARCH).$O\
-       modf_$(GOARCH).$O\
-       remainder_$(GOARCH).$O\
-       sin_$(GOARCH).$O\
-       sincos_$(GOARCH).$O\
-       sqrt_$(GOARCH).$O\
-       tan_$(GOARCH).$O\
-
-GOFILES=\
-       abs.go\
-       acosh.go\
-       asin.go\
-       asinh.go\
-       atan.go\
-       atanh.go\
-       atan2.go\
-       bits.go\
-       cbrt.go\
-       const.go\
-       copysign.go\
-       dim.go\
-       erf.go\
-       exp.go\
-       expm1.go\
-       floor.go\
-       frexp.go\
-       gamma.go\
-       hypot.go\
-       j0.go\
-       j1.go\
-       jn.go\
-       lgamma.go\
-       ldexp.go\
-       log.go\
-       log10.go\
-       log1p.go\
-       logb.go\
-       mod.go\
-       modf.go\
-       nextafter.go\
-       pow.go\
-       pow10.go\
-       remainder.go\
-       signbit.go\
-       sin.go\
-       sincos.go\
-       sinh.go\
-       sqrt.go\
-       tan.go\
-       tanh.go\
-       unsafe.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/math/big/Makefile b/src/pkg/math/big/Makefile
deleted file mode 100644 (file)
index 1ba0818..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=math/big
-GOFILES=\
-       arith.go\
-       arith_decl.go\
-       int.go\
-       nat.go\
-       rat.go\
-
-OFILES=\
-       arith_$(GOARCH).$O\
-
-include ../../../Make.pkg
diff --git a/src/pkg/math/cmplx/Makefile b/src/pkg/math/cmplx/Makefile
deleted file mode 100644 (file)
index b6e8aa3..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2010 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=math/cmplx
-
-GOFILES=\
-       abs.go\
-       asin.go\
-       conj.go\
-       exp.go\
-       isinf.go\
-       isnan.go\
-       log.go\
-       phase.go\
-       polar.go\
-       pow.go\
-       rect.go\
-       sin.go\
-       sqrt.go\
-       tan.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/math/rand/Makefile b/src/pkg/math/rand/Makefile
deleted file mode 100644 (file)
index d2903d5..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=math/rand
-GOFILES=\
-       exp.go\
-       normal.go\
-       rand.go\
-       rng.go\
-       zipf.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/mime/Makefile b/src/pkg/mime/Makefile
deleted file mode 100644 (file)
index 38d809c..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=mime
-GOFILES=\
-       grammar.go\
-       mediatype.go\
-       type.go\
-
-GOFILES_freebsd=\
-       type_unix.go
-
-GOFILES_darwin=\
-       type_unix.go
-
-GOFILES_linux=\
-       type_unix.go
-
-GOFILES_netbsd=\
-       type_unix.go
-
-GOFILES_openbsd=\
-       type_unix.go
-
-GOFILES_plan9=\
-       type_unix.go
-
-GOFILES_windows=\
-       type_windows.go
-
-GOFILES+=$(GOFILES_$(GOOS))
-
-include ../../Make.pkg
diff --git a/src/pkg/mime/multipart/Makefile b/src/pkg/mime/multipart/Makefile
deleted file mode 100644 (file)
index de1a439..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2010 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=mime/multipart
-GOFILES=\
-       formdata.go\
-       multipart.go\
-       writer.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/net/Makefile b/src/pkg/net/Makefile
deleted file mode 100644 (file)
index a02798c..0000000
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=net
-GOFILES=\
-       dial.go\
-       dnsclient.go\
-       dnsmsg.go\
-       doc.go\
-       hosts.go\
-       interface.go\
-       ip.go\
-       iprawsock.go\
-       ipsock.go\
-       net.go\
-       parse.go\
-       pipe.go\
-       tcpsock.go\
-       udpsock.go\
-       unixsock.go\
-
-GOFILES_darwin=\
-       dnsclient_unix.go\
-       dnsconfig.go\
-       fd.go\
-       fd_$(GOOS).go\
-       file.go\
-       interface_bsd.go\
-       interface_darwin.go\
-       iprawsock_posix.go\
-       ipsock_posix.go\
-       lookup_unix.go\
-       newpollserver.go\
-       port.go\
-       sendfile_stub.go\
-       sock.go\
-       sock_bsd.go\
-       sockopt.go\
-       sockopt_bsd.go\
-       sockoptip.go\
-       sockoptip_bsd.go\
-       sockoptip_darwin.go\
-       tcpsock_posix.go\
-       udpsock_posix.go\
-       unixsock_posix.go\
-
-ifeq ($(CGO_ENABLED),1)
-CGOFILES_darwin=\
-       cgo_bsd.go\
-       cgo_unix.go
-else
-GOFILES_darwin+=cgo_stub.go
-endif
-
-GOFILES_freebsd=\
-       dnsclient_unix.go\
-       dnsconfig.go\
-       fd.go\
-       fd_$(GOOS).go\
-       file.go\
-       interface_bsd.go\
-       interface_freebsd.go\
-       iprawsock_posix.go\
-       ipsock_posix.go\
-       lookup_unix.go\
-       newpollserver.go\
-       port.go\
-       sendfile_stub.go\
-       sock.go\
-       sock_bsd.go\
-       sockopt.go\
-       sockopt_bsd.go\
-       sockoptip.go\
-       sockoptip_bsd.go\
-       sockoptip_freebsd.go\
-       tcpsock_posix.go\
-       udpsock_posix.go\
-       unixsock_posix.go\
-
-ifeq ($(CGO_ENABLED),1)
-CGOFILES_freebsd=\
-       cgo_bsd.go\
-       cgo_unix.go
-else
-GOFILES_freebsd+=cgo_stub.go
-endif
-
-GOFILES_linux=\
-       dnsclient_unix.go\
-       dnsconfig.go\
-       fd.go\
-       fd_$(GOOS).go\
-       file.go\
-       interface_linux.go\
-       iprawsock_posix.go\
-       ipsock_posix.go\
-       lookup_unix.go\
-       newpollserver.go\
-       port.go\
-       sendfile_linux.go\
-       sock.go\
-       sock_linux.go\
-       sockopt.go\
-       sockopt_linux.go\
-       sockoptip.go\
-       sockoptip_linux.go\
-       tcpsock_posix.go\
-       udpsock_posix.go\
-       unixsock_posix.go\
-
-ifeq ($(CGO_ENABLED),1)
-CGOFILES_linux=\
-       cgo_linux.go\
-       cgo_unix.go
-else
-GOFILES_linux+=cgo_stub.go
-endif
-
-GOFILES_netbsd=\
-       dnsclient_unix.go\
-       dnsconfig.go\
-       fd.go\
-       fd_$(GOOS).go\
-       file.go\
-       interface_bsd.go\
-       interface_netbsd.go\
-       iprawsock_posix.go\
-       ipsock_posix.go\
-       lookup_unix.go\
-       newpollserver.go\
-       port.go\
-       sendfile_stub.go\
-       sock.go\
-       sock_bsd.go\
-       sockopt.go\
-       sockopt_bsd.go\
-       sockoptip.go\
-       sockoptip_bsd.go\
-       sockoptip_netbsd.go\
-       tcpsock_posix.go\
-       udpsock_posix.go\
-       unixsock_posix.go\
-       cgo_stub.go\
-
-GOFILES_openbsd=\
-       dnsclient_unix.go\
-       dnsconfig.go\
-       fd.go\
-       fd_$(GOOS).go\
-       file.go\
-       interface_bsd.go\
-       interface_openbsd.go\
-       iprawsock_posix.go\
-       ipsock_posix.go\
-       lookup_unix.go\
-       newpollserver.go\
-       port.go\
-       sendfile_stub.go\
-       sock.go\
-       sock_bsd.go\
-       sockopt.go\
-       sockopt_bsd.go\
-       sockoptip.go\
-       sockoptip_bsd.go\
-       sockoptip_openbsd.go\
-       tcpsock_posix.go\
-       udpsock_posix.go\
-       unixsock_posix.go\
-       cgo_stub.go\
-
-GOFILES_plan9=\
-       file_plan9.go\
-       interface_stub.go\
-       iprawsock_plan9.go\
-       ipsock_plan9.go\
-       lookup_plan9.go\
-       tcpsock_plan9.go\
-       udpsock_plan9.go\
-       unixsock_plan9.go\
-
-GOFILES_windows=\
-       fd_$(GOOS).go\
-       file_windows.go\
-       interface_windows.go\
-       iprawsock_posix.go\
-       ipsock_posix.go\
-       lookup_windows.go\
-       sendfile_windows.go\
-       sock.go\
-       sock_windows.go\
-       sockopt.go\
-       sockopt_windows.go\
-       sockoptip.go\
-       sockoptip_windows.go\
-       tcpsock_posix.go\
-       udpsock_posix.go\
-       unixsock_posix.go\
-
-GOFILES+=$(GOFILES_$(GOOS))
-ifneq ($(CGOFILES_$(GOOS)),)
-CGOFILES+=$(CGOFILES_$(GOOS))
-endif
-
-include ../../Make.pkg
diff --git a/src/pkg/net/http/Makefile b/src/pkg/net/http/Makefile
deleted file mode 100644 (file)
index 5c351b0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=net/http
-GOFILES=\
-       chunked.go\
-       client.go\
-       cookie.go\
-       filetransport.go\
-       fs.go\
-       header.go\
-       jar.go\
-       lex.go\
-       request.go\
-       response.go\
-       server.go\
-       sniff.go\
-       status.go\
-       transfer.go\
-       transport.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/net/http/cgi/Makefile b/src/pkg/net/http/cgi/Makefile
deleted file mode 100644 (file)
index 0d6be01..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../../Make.inc
-
-TARG=net/http/cgi
-GOFILES=\
-       child.go\
-       host.go\
-
-include ../../../../Make.pkg
diff --git a/src/pkg/net/http/fcgi/Makefile b/src/pkg/net/http/fcgi/Makefile
deleted file mode 100644 (file)
index 9a75f1a..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../../Make.inc
-
-TARG=net/http/fcgi
-GOFILES=\
-       child.go\
-       fcgi.go\
-
-include ../../../../Make.pkg
diff --git a/src/pkg/net/http/httptest/Makefile b/src/pkg/net/http/httptest/Makefile
deleted file mode 100644 (file)
index 3bb4454..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../../Make.inc
-
-TARG=net/http/httptest
-GOFILES=\
-       recorder.go\
-       server.go\
-
-include ../../../../Make.pkg
diff --git a/src/pkg/net/http/httputil/Makefile b/src/pkg/net/http/httputil/Makefile
deleted file mode 100644 (file)
index 8bfc7a0..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../../Make.inc
-
-TARG=net/http/httputil
-GOFILES=\
-       chunked.go\
-       dump.go\
-       persist.go\
-       reverseproxy.go\
-
-include ../../../../Make.pkg
diff --git a/src/pkg/net/http/pprof/Makefile b/src/pkg/net/http/pprof/Makefile
deleted file mode 100644 (file)
index b78fce8..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2010 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../../Make.inc
-
-TARG=net/http/pprof
-GOFILES=\
-       pprof.go\
-
-include ../../../../Make.pkg
diff --git a/src/pkg/net/mail/Makefile b/src/pkg/net/mail/Makefile
deleted file mode 100644 (file)
index acb1c2a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=net/mail
-GOFILES=\
-       message.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/net/rpc/Makefile b/src/pkg/net/rpc/Makefile
deleted file mode 100644 (file)
index 0e6c984..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=net/rpc
-GOFILES=\
-       client.go\
-       debug.go\
-       server.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/net/rpc/jsonrpc/Makefile b/src/pkg/net/rpc/jsonrpc/Makefile
deleted file mode 100644 (file)
index c5ea537..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2010 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../../Make.inc
-
-TARG=net/rpc/jsonrpc
-GOFILES=\
-       client.go\
-       server.go\
-
-include ../../../../Make.pkg
diff --git a/src/pkg/net/smtp/Makefile b/src/pkg/net/smtp/Makefile
deleted file mode 100644 (file)
index d9812d5..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2010 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=net/smtp
-GOFILES=\
-       auth.go\
-       smtp.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/net/textproto/Makefile b/src/pkg/net/textproto/Makefile
deleted file mode 100644 (file)
index cadf3ab..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2010 The Go Authors.  All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=net/textproto
-GOFILES=\
-       header.go\
-       pipeline.go\
-       reader.go\
-       textproto.go\
-       writer.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/net/url/Makefile b/src/pkg/net/url/Makefile
deleted file mode 100644 (file)
index bef0647..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=net/url
-GOFILES=\
-       url.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/old/netchan/Makefile b/src/pkg/old/netchan/Makefile
deleted file mode 100644 (file)
index c8f4125..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=old/netchan
-GOFILES=\
-       common.go\
-       export.go\
-       import.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/old/regexp/Makefile b/src/pkg/old/regexp/Makefile
deleted file mode 100644 (file)
index ccf99d1..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=old/regexp
-GOFILES=\
-       regexp.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/old/template/Makefile b/src/pkg/old/template/Makefile
deleted file mode 100644 (file)
index 5772cb4..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=old/template
-GOFILES=\
-       doc.go\
-       execute.go\
-       format.go\
-       parse.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/os/Makefile b/src/pkg/os/Makefile
deleted file mode 100644 (file)
index ca83ff1..0000000
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=os
-GOFILES=\
-       doc.go\
-       error.go\
-       env.go\
-       exec.go\
-       file.go\
-       getwd.go\
-       path.go\
-       proc.go\
-       stat_$(GOOS).go\
-       time.go\
-       types.go\
-
-GOFILES_freebsd=\
-       dir_unix.go\
-       error_posix.go\
-       file_posix.go\
-       file_unix.go\
-       path_unix.go\
-       sys_bsd.go\
-       exec_posix.go\
-       exec_unix.go\
-
-GOFILES_darwin=\
-       dir_unix.go\
-       error_posix.go\
-       file_posix.go\
-       file_unix.go\
-       path_unix.go\
-       sys_bsd.go\
-       exec_posix.go\
-       exec_unix.go\
-
-GOFILES_linux=\
-       dir_unix.go\
-       error_posix.go\
-       file_posix.go\
-       file_unix.go\
-       path_unix.go\
-       sys_linux.go\
-       exec_posix.go\
-       exec_unix.go\
-
-GOFILES_netbsd=\
-       dir_unix.go\
-       error_posix.go\
-       file_posix.go\
-       file_unix.go\
-       path_unix.go\
-       sys_bsd.go\
-       exec_posix.go\
-       exec_unix.go\
-
-GOFILES_openbsd=\
-       dir_unix.go\
-       error_posix.go\
-       file_posix.go\
-       file_unix.go\
-       path_unix.go\
-       sys_bsd.go\
-       exec_posix.go\
-       exec_unix.go\
-
-GOFILES_windows=\
-       dir_windows.go\
-       error_posix.go\
-       file_posix.go\
-       file_windows.go\
-       path_windows.go\
-       sys_windows.go\
-       exec_posix.go\
-       exec_windows.go\
-
-GOFILES_plan9=\
-       dir_plan9.go\
-       error_plan9.go\
-       file_plan9.go\
-       path_plan9.go\
-       sys_plan9.go\
-       exec_plan9.go\
-       str.go\
-
-GOFILES+=$(GOFILES_$(GOOS))
-
-include ../../Make.pkg
diff --git a/src/pkg/os/exec/Makefile b/src/pkg/os/exec/Makefile
deleted file mode 100644 (file)
index e67dfba..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=os/exec
-GOFILES=\
-       exec.go\
-
-GOFILES_freebsd=\
-       lp_unix.go\
-
-GOFILES_darwin=\
-       lp_unix.go\
-
-GOFILES_linux=\
-       lp_unix.go\
-
-GOFILES_netbsd=\
-       lp_unix.go\
-
-GOFILES_openbsd=\
-       lp_unix.go\
-
-GOFILES_windows=\
-       lp_windows.go\
-
-GOFILES_plan9=\
-       lp_plan9.go\
-
-GOFILES+=$(GOFILES_$(GOOS))
-
-include ../../../Make.pkg
diff --git a/src/pkg/os/signal/Makefile b/src/pkg/os/signal/Makefile
deleted file mode 100644 (file)
index 26f5876..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=os/signal
-GOFILES=\
-       signal.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/os/user/Makefile b/src/pkg/os/user/Makefile
deleted file mode 100644 (file)
index c3617c2..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=os/user
-GOFILES=\
-       user.go\
-
-GOFILES_windows=\
-       lookup_windows.go
-
-ifeq ($(CGO_ENABLED),1)
-CGOFILES_linux=\
-       lookup_unix.go
-CGOFILES_freebsd=\
-       lookup_unix.go
-CGOFILES_darwin=\
-       lookup_unix.go
-endif
-
-ifneq ($(CGOFILES_$(GOOS)),)
-CGOFILES+=$(CGOFILES_$(GOOS))
-else
-ifneq ($(GOOS),windows)
-GOFILES+=lookup_stubs.go
-endif
-endif
-
-GOFILES+=$(GOFILES_$(GOOS))
-
-include ../../../Make.pkg
diff --git a/src/pkg/path/Makefile b/src/pkg/path/Makefile
deleted file mode 100644 (file)
index a7e0571..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=path
-GOFILES=\
-       match.go\
-       path.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/path/filepath/Makefile b/src/pkg/path/filepath/Makefile
deleted file mode 100644 (file)
index 7f8ea30..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=path/filepath
-GOFILES=\
-       match.go\
-       path.go\
-
-GOFILES_freebsd=\
-       path_unix.go
-
-GOFILES_darwin=\
-       path_unix.go
-
-GOFILES_linux=\
-       path_unix.go
-
-GOFILES_netbsd=\
-       path_unix.go
-
-GOFILES_openbsd=\
-       path_unix.go
-
-GOFILES_plan9=\
-       path_plan9.go
-
-GOFILES_windows=\
-       path_windows.go
-
-GOFILES+=$(GOFILES_$(GOOS))
-
-include ../../../Make.pkg
index 11b636cac75343ec89c806dca3d7c2568a1150c9..5b0630fdc9bdc119c159f7badf404e4936b6bae5 100644 (file)
@@ -635,11 +635,11 @@ func TestEvalSymlinks(t *testing.T) {
 var abstests = []string{
        "../AUTHORS",
        "pkg/../../AUTHORS",
-       "Make.pkg",
-       "pkg/Makefile",
+       "Make.inc",
+       "pkg/math",
        ".",
-       "$GOROOT/src/Make.pkg",
-       "$GOROOT/src/../src/Make.pkg",
+       "$GOROOT/src/Make.inc",
+       "$GOROOT/src/../src/Make.inc",
        "$GOROOT/misc/cgo",
        "$GOROOT",
 }
diff --git a/src/pkg/reflect/Makefile b/src/pkg/reflect/Makefile
deleted file mode 100644 (file)
index b946449..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=reflect
-GOFILES=\
-       deepequal.go\
-       type.go\
-       value.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/regexp/Makefile b/src/pkg/regexp/Makefile
deleted file mode 100644 (file)
index 60406c7..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=regexp
-GOFILES=\
-       exec.go\
-       regexp.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/regexp/syntax/Makefile b/src/pkg/regexp/syntax/Makefile
deleted file mode 100644 (file)
index 0b3764e..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=regexp/syntax
-GOFILES=\
-       compile.go\
-       parse.go\
-       perl_groups.go\
-       prog.go\
-       regexp.go\
-       simplify.go\
-
-include ../../../Make.pkg
index 50d0515e2ab76b0578069dd1b8d3ea0a86bbbef7..2cded8b473a3c81501ce252c4acacd1048d00d45 100644 (file)
@@ -4,103 +4,6 @@
 
 include ../../Make.inc
 
-TARG=runtime
-
-GOFILES=\
-       debug.go\
-       error.go\
-       extern.go\
-       mem.go\
-       sig.go\
-       softfloat64.go\
-       type.go\
-       zgoarch_$(GOARCH).go\
-       zgoos_$(GOOS).go\
-       zruntime_defs_$(GOOS)_$(GOARCH).go\
-       zversion.go\
-
-OFILES_darwin=\
-       lock_sema.$O\
-
-OFILES_freebsd=\
-       lock_futex.$O\
-
-OFILES_linux=\
-       lock_futex.$O\
-
-OFILES_netbsd=\
-       lock_sema.$O\
-
-OFILES_openbsd=\
-       lock_sema.$O\
-
-OFILES_plan9=\
-       lock_sema.$O\
-
-OFILES_windows=\
-       callback_windows_$(GOARCH).$O\
-       lock_sema.$O\
-       zsyscall_windows_$(GOARCH).$O\
-
-# 386-specific object files
-OFILES_386=\
-       vlop_386.$O\
-       vlrt_386.$O\
-       traceback_x86.$O\
-
-# amd64-specific object files
-OFILES_amd64=\
-       traceback_x86.$O\
-
-# arm-specific object files
-OFILES_arm=\
-       memset_arm.$O\
-       softfloat_arm.$O\
-       vlop_arm.$O\
-       vlrt_arm.$O\
-       traceback_arm.$O\
-
-OFILES=\
-       $(OFILES_$(GOARCH))\
-       $(OFILES_$(GOOS))\
-       alg.$O\
-       asm_$(GOARCH).$O\
-       atomic_$(GOARCH).$O\
-       cgocall.$O\
-       chan.$O\
-       closure_$(GOARCH).$O\
-       complex.$O\
-       cpuprof.$O\
-       float.$O\
-       hashmap.$O\
-       iface.$O\
-       mcache.$O\
-       mcentral.$O\
-       mem_$(GOOS).$O\
-       memmove_$(GOARCH).$O\
-       mfinal.$O\
-       mfixalloc.$O\
-       mgc0.$O\
-       mheap.$O\
-       msize.$O\
-       print.$O\
-       proc.$O\
-       rt0_$(GOOS)_$(GOARCH).$O\
-       rune.$O\
-       runtime.$O\
-       signal_$(GOOS)_$(GOARCH).$O\
-       slice.$O\
-       symtab.$O\
-       sys_$(GOOS)_$(GOARCH).$O\
-       thread_$(GOOS).$O\
-       zmalloc_$(GOARCH).$O\
-       zmprof_$(GOARCH).$O\
-       zruntime1_$(GOARCH).$O\
-       zsema_$(GOARCH).$O\
-       zsigqueue_$(GOARCH).$O\
-       zstring_$(GOARCH).$O\
-       ztime_$(GOARCH).$O\
-
 AUTOHFILES=\
        arch_GOARCH.h\
        os_GOOS.h\
@@ -108,32 +11,17 @@ AUTOHFILES=\
        defs_GOOS_GOARCH.h\
        zasm_GOOS_GOARCH.h\
 
-HFILES=\
-       cgocall.h\
-       runtime.h\
-       hashmap.h\
-       malloc.h\
-       stack.h\
-       $(AUTOHFILES)\
-
-GOFILES+=$(GOFILES_$(GOOS))
+all:
+       @echo use make install, make clean
 
-# For use by cgo.
-INSTALLFILES=$(pkgdir)/runtime.h $(pkgdir)/cgocall.h
-
-# Go tool will do this for package runtime.
-AFLAGS+=-DGOOS_$(GOOS) -DGOARCH_$(GOARCH)
-CFLAGS+=-DGOOS_$(GOOS) -DGOARCH_$(GOARCH)
-
-# special, out of the way compiler flag that means "add runtime metadata to output"
-GC+= -+
-
-include ../../Make.pkg
+pkgdir=$(QUOTED_GOROOT)/pkg/$(GOOS)_$(GOARCH)
 
 $(pkgdir)/%.h: %.h
        @test -d $(QUOTED_GOROOT)/pkg && mkdir -p $(pkgdir)
        cp $< "$@"
 
+install: $(pkgdir)/runtime.h $(pkgdir)/cgocall.h
+
 clean: clean-local
 
 clean-local:
diff --git a/src/pkg/runtime/cgo/Makefile b/src/pkg/runtime/cgo/Makefile
deleted file mode 100644 (file)
index 05c7eba..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 2010 The Go Authors.  All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=runtime/cgo
-
-GOFILES=\
-       cgo.go\
-
-ifeq ($(CGO_ENABLED),1)
-
-# Unwarranted chumminess with Make.pkg's cgo rules.
-# Do not try this at home.
-CGO_OFILES=\
-       gcc_$(GOARCH).o\
-       gcc_$(GOOS)_$(GOARCH).o\
-       gcc_util.o\
-
-ifeq ($(GOOS),windows)
-CGO_LDFLAGS=-lm -mthreads
-else
-CGO_LDFLAGS=-lpthread
-CGO_OFILES+=gcc_setenv.o\
-
-endif
-
-OFILES=\
-       iscgo.$O\
-       callbacks.$O\
-       _cgo_import.$O\
-       $(CGO_OFILES)\
-
-ifeq ($(GOOS),freebsd)
-OFILES+=\
-       freebsd.$O\
-
-endif
-
-endif
-
-include ../../../Make.pkg
-
-ifeq ($(CGO_ENABLED),1)
-_cgo_defun.c:
-       echo >$@
-
-_cgo_main.c:
-       echo 'int main() { return 0; }' >$@
-endif
-
-gcc_$(GOARCH).o: gcc_$(GOARCH).S
-       $(HOST_CC) $(_CGO_CFLAGS_$(GOARCH)) -g -O2 -fPIC -o $@ -c $^
-
-gcc_$(GOOS)_$(GOARCH).o: gcc_$(GOOS)_$(GOARCH).c
-       $(HOST_CC) $(_CGO_CFLAGS_$(GOARCH)) -g -O2 -fPIC -o $@ -c $^
-
-gcc_%.o: gcc_%.c
-       $(HOST_CC) $(_CGO_CFLAGS_$(GOARCH)) -g -O2 -fPIC -o $@ -c $^
diff --git a/src/pkg/runtime/debug/Makefile b/src/pkg/runtime/debug/Makefile
deleted file mode 100644 (file)
index 885f66a..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=runtime/debug
-GOFILES=\
-       stack.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/runtime/pprof/Makefile b/src/pkg/runtime/pprof/Makefile
deleted file mode 100644 (file)
index 8bccc0c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2010 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=runtime/pprof
-GOFILES=\
-       pprof.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/sort/Makefile b/src/pkg/sort/Makefile
deleted file mode 100644 (file)
index 9deaabf..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=sort
-GOFILES=\
-       search.go\
-       sort.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/strconv/Makefile b/src/pkg/strconv/Makefile
deleted file mode 100644 (file)
index f4e4dfb..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=strconv
-GOFILES=\
-       atob.go\
-       atof.go\
-       atoi.go\
-       decimal.go\
-       extfloat.go\
-       ftoa.go\
-       itoa.go\
-       quote.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/strings/Makefile b/src/pkg/strings/Makefile
deleted file mode 100644 (file)
index 872bb43..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=strings
-GOFILES=\
-       reader.go\
-       replace.go\
-       strings.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/sync/Makefile b/src/pkg/sync/Makefile
deleted file mode 100644 (file)
index e8a7662..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=sync
-GOFILES=\
-       cond.go\
-       mutex.go\
-       once.go \
-       rwmutex.go\
-       waitgroup.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/sync/atomic/Makefile b/src/pkg/sync/atomic/Makefile
deleted file mode 100644 (file)
index 38d8998..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=sync/atomic
-GOFILES=\
-       doc.go\
-
-OFILES=\
-       asm_$(GOARCH).$O\
-
-ifeq ($(GOARCH),arm)
-OFILES+=asm_$(GOOS)_$(GOARCH).$O
-endif
-
-include ../../../Make.pkg
diff --git a/src/pkg/syscall/Makefile b/src/pkg/syscall/Makefile
deleted file mode 100644 (file)
index 8bee987..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=syscall
-GOFILES=\
-       str.go\
-       syscall.go\
-       syscall_$(GOOS).go\
-       syscall_$(GOOS)_$(GOARCH).go\
-       zerrors_$(GOOS)_$(GOARCH).go\
-       zsyscall_$(GOOS)_$(GOARCH).go\
-       zsysnum_$(GOOS)_$(GOARCH).go\
-       ztypes_$(GOOS)_$(GOARCH).go\
-
-GOFILES_darwin=\
-       bpf_bsd.go\
-       env_unix.go\
-       exec_bsd.go\
-       exec_unix.go\
-       route_bsd.go\
-       route_darwin.go\
-       sockcmsg_unix.go\
-       syscall_bsd.go\
-       syscall_unix.go\
-
-GOFILES_freebsd=\
-       bpf_bsd.go\
-       env_unix.go\
-       exec_bsd.go\
-       exec_unix.go\
-       route_bsd.go\
-       route_freebsd.go\
-       sockcmsg_unix.go\
-       syscall_bsd.go\
-       syscall_unix.go\
-
-GOFILES_linux=\
-       env_unix.go\
-       exec_unix.go\
-       exec_linux.go\
-       lsf_linux.go\
-       netlink_linux.go\
-       sockcmsg_linux.go\
-       sockcmsg_unix.go\
-       syscall_unix.go\
-
-GOFILES_netbsd=\
-       bpf_bsd.go\
-       env_unix.go\
-       exec_bsd.go\
-       exec_unix.go\
-       route_bsd.go\
-       route_netbsd.go\
-       sockcmsg_unix.go\
-       syscall_bsd.go\
-       syscall_unix.go\
-
-GOFILES_openbsd=\
-       bpf_bsd.go\
-       env_unix.go\
-       exec_bsd.go\
-       exec_unix.go\
-       route_bsd.go\
-       route_openbsd.go\
-       sockcmsg_unix.go\
-       syscall_bsd.go\
-       syscall_unix.go\
-       zsysctl_openbsd.go\
-
-GOFILES_plan9=\
-       env_plan9.go\
-       exec_plan9.go\
-
-GOFILES_windows=\
-       dll_windows.go\
-       env_windows.go\
-       exec_windows.go\
-       security_windows.go\
-       zerrors_windows.go\
-       ztypes_windows.go\
-
-OFILES=\
-       asm_$(GOOS)_$(GOARCH).$O\
-
-GOFILES+=$(GOFILES_$(GOOS))
-
-include ../../Make.pkg
diff --git a/src/pkg/testing/Makefile b/src/pkg/testing/Makefile
deleted file mode 100644 (file)
index a0c1232..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=testing
-GOFILES=\
-       benchmark.go\
-       example.go\
-       testing.go\
-
-include ../../Make.pkg
diff --git a/src/pkg/testing/iotest/Makefile b/src/pkg/testing/iotest/Makefile
deleted file mode 100644 (file)
index 43a047c..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=testing/iotest
-GOFILES=\
-       logger.go\
-       reader.go\
-       writer.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/testing/quick/Makefile b/src/pkg/testing/quick/Makefile
deleted file mode 100644 (file)
index 6d3b736..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=testing/quick
-GOFILES=\
-       quick.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/testing/script/Makefile b/src/pkg/testing/script/Makefile
deleted file mode 100644 (file)
index 9388d97..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=testing/script
-GOFILES=\
-       script.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/text/scanner/Makefile b/src/pkg/text/scanner/Makefile
deleted file mode 100644 (file)
index c0f28dc..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=text/scanner
-GOFILES=\
-       scanner.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/text/tabwriter/Makefile b/src/pkg/text/tabwriter/Makefile
deleted file mode 100644 (file)
index ba1bf57..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=text/tabwriter
-GOFILES=\
-       tabwriter.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/text/template/Makefile b/src/pkg/text/template/Makefile
deleted file mode 100644 (file)
index 0e83114..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=text/template
-GOFILES=\
-       doc.go\
-       exec.go\
-       funcs.go\
-       helper.go\
-       template.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/text/template/parse/Makefile b/src/pkg/text/template/parse/Makefile
deleted file mode 100644 (file)
index 75cade8..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../../Make.inc
-
-TARG=text/template/parse
-GOFILES=\
-       lex.go\
-       node.go\
-       parse.go\
-
-include ../../../../Make.pkg
diff --git a/src/pkg/time/Makefile b/src/pkg/time/Makefile
deleted file mode 100644 (file)
index 9f61329..0000000
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../Make.inc
-
-TARG=time
-GOFILES=\
-       format.go\
-       sleep.go\
-       tick.go\
-       time.go\
-       zoneinfo.go\
-
-GOFILES_freebsd=\
-       sys_unix.go\
-       zoneinfo_unix.go\
-
-GOFILES_darwin=\
-       sys_unix.go\
-       zoneinfo_unix.go\
-
-GOFILES_linux=\
-       sys_unix.go\
-       zoneinfo_unix.go\
-
-GOFILES_netbsd=\
-       sys_unix.go\
-       zoneinfo_unix.go\
-
-GOFILES_openbsd=\
-       sys_unix.go\
-       zoneinfo_unix.go\
-
-GOFILES_windows=\
-       sys_windows.go\
-       zoneinfo_windows.go\
-
-GOFILES_plan9=\
-       sys_plan9.go\
-       zoneinfo_plan9.go\
-
-GOFILES+=$(GOFILES_$(GOOS))
-
-include ../../Make.pkg
index 4472a6c67e0476c821e377597a99065b3169e6e6..91eb3c45da5f3d949bd951a82dfabf9e6b14b1ad 100644 (file)
@@ -4,33 +4,15 @@
 
 include ../../Make.inc
 
-TARG=unicode
-GOFILES=\
-       casetables.go\
-       digit.go\
-       graphic.go\
-       letter.go\
-       tables.go\
-
-include ../../Make.pkg
-
-CLEANFILES+=maketables
-
 maketables: maketables.go
-       $(GC) $(GCFLAGS) $(GCIMPORTS) maketables.go
-       $(LD) -o maketables maketables.$O
+       go build maketables.go
 
 tables:        maketables
        ./maketables --tables=all > tables.go
        gofmt -w tables.go
 
-# Build (but do not run) maketables during testing,
-# just to make sure it still compiles.
-test: maketables
-testshort: maketables
-
 # Downloads from www.unicode.org, so not part
 # of standard test scripts.
 testtables: maketables
-       @echo '***' Be sure to make tables and make install first
+       @echo '***' Be sure to make tables and go install first
        ./maketables -test
diff --git a/src/pkg/unicode/utf16/Makefile b/src/pkg/unicode/utf16/Makefile
deleted file mode 100644 (file)
index f64b3c8..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=unicode/utf16
-GOFILES=\
-       utf16.go\
-
-include ../../../Make.pkg
diff --git a/src/pkg/unicode/utf8/Makefile b/src/pkg/unicode/utf8/Makefile
deleted file mode 100644 (file)
index b6c36f0..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-include ../../../Make.inc
-
-TARG=unicode/utf8
-GOFILES=\
-       utf8.go\
-
-include ../../../Make.pkg
index 3343bf950593dff38b3878fb9498b7671935df6e..f182922864e416432977855c5937c8dab1bb411b 100755 (executable)
@@ -31,111 +31,91 @@ xcd() {
 }
 
 if $rebuild; then
-       if $USE_GO_TOOL; then
-               echo
-               echo '# Package builds'
-               time go install -a -v std
-       else
-               (xcd pkg
-                       gomake clean
-                       time gomake install
-               ) || exit $?
-       fi
-fi
-
-if $USE_GO_TOOL; then
        echo
-       echo '# Package tests'
-       time go test std -short
-else
-       (xcd pkg
-       gomake testshort
-       ) || exit $?
+       echo '# Package builds'
+       time go install -a -v std
 fi
 
-if $USE_GO_TOOL; then
-       echo
-       echo '# runtime -cpu=1,2,4'
-       go test runtime -short -cpu=1,2,4
-else
-       (xcd pkg/runtime;
-       go test -short -cpu=1,2,4
-       ) || exit $?
-fi
+echo
+echo '# Package tests'
+time go test std -short
 
-if $USE_GO_TOOL; then
-       echo
-       echo '# sync -cpu=10'
-       go test sync -short -cpu=10
-else
-       (xcd pkg/sync;
-       GOMAXPROCS=10 gomake testshort
-       ) || exit $?
-fi
+echo
+echo '# runtime -cpu=1,2,4'
+go test runtime -short -cpu=1,2,4
 
-if $USE_GO_TOOL; then
-       echo
-       echo '# Build bootstrap scripts'
-       ./buildscript.sh
-fi
+echo
+echo '# sync -cpu=10'
+go test sync -short -cpu=10
 
-(xcd pkg/exp/ebnflint
-time gomake test
-) || exit $?
+echo
+echo '# Build bootstrap scripts'
+./buildscript.sh
+
+BROKEN=true
 
+$BROKEN ||
 [ "$CGO_ENABLED" != 1 ] ||
 [ "$GOHOSTOS" == windows ] ||
 (xcd ../misc/cgo/stdio
-gomake clean
+"$GOMAKE" clean
 ./test.bash
 ) || exit $?
 
+$BROKEN ||
 [ "$CGO_ENABLED" != 1 ] ||
 (xcd ../misc/cgo/life
-gomake clean
+"$GOMAKE" clean
 ./test.bash
 ) || exit $?
 
+$BROKEN ||
 [ "$CGO_ENABLED" != 1 ] ||
 (xcd ../misc/cgo/test
-gomake clean
-gomake test
+"$GOMAKE" clean
+gotest
 ) || exit $?
 
+$BROKEN ||
 [ "$CGO_ENABLED" != 1 ] ||
 [ "$GOHOSTOS" == windows ] ||
 [ "$GOHOSTOS" == darwin ] ||
 (xcd ../misc/cgo/testso
-gomake clean
+"$GOMAKE" clean
 ./test.bash
 ) || exit $?
 
+$BROKEN ||
 (xcd ../doc/progs
 time ./run
 ) || exit $?
 
+$BROKEN ||
 [ "$GOARCH" == arm ] ||  # uses network, fails under QEMU
 (xcd ../doc/codelab/wiki
-gomake clean
-gomake
-gomake test
+"$GOMAKE" clean
+"$GOMAKE"
+"$GOMAKE" test
 ) || exit $?
 
+$BROKEN ||
 for i in ../misc/dashboard/builder ../misc/goplay
 do
        (xcd $i
-       gomake clean
-       gomake
+       "$GOMAKE" clean
+       "$GOMAKE"
        ) || exit $?
 done
 
+$BROKEN ||
 [ "$GOARCH" == arm ] ||
 (xcd ../test/bench/shootout
 ./timing.sh -test
 ) || exit $?
 
+$BROKEN ||
 (xcd ../test/bench/go1
-gomake test
+"$GOMAKE" test
 ) || exit $?
 
 (xcd ../test
index bd18cefe45430c868350e330fa69d9f3175e0e08..4a9be1207f798372100aa3a2128ff6883b253d5d 100755 (executable)
--- a/test/run
+++ b/test/run
@@ -3,7 +3,7 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-eval $(gomake --no-print-directory -f ../src/Make.inc go-env)
+eval $(../bin/go-tool/make --no-print-directory -f ../src/Make.inc go-env)
 
 export E=