build Make.deps during make.bash instead

of keeping a checked-in copy.  doesn't
slow down make.bash appreciably.

R=r
https://golang.org/cl/156099

diff --git a/.hgignore b/.hgignore
index 7d26f2c4351e48a71deb82dd101da3632d65dd92..c739a20b7fa3bc691cb568a77b3f1704ede1b402 100644 (file)
--- a/.hgignore
+++ b/.hgignore
@@ -18,6 +18,7 @@ src/cmd/?l/enam.c
 src/cmd/gc/builtin.c
 src/cmd/gc/mkbuiltin1
 src/cmd/gc/opnames.h
+src/pkg/Make.deps
 src/pkg/exp/ogle/ogle
 src/pkg/runtime/cgo2c
 src/pkg/runtime/*/asm.h

diff --git a/doc/contribute.html b/doc/contribute.html
index 39bba87a89080f1b188b87fb0b71fa4d000ef002..d2bf660290d2acb327311665a326658e6c7035f8 100644 (file)
--- a/doc/contribute.html
+++ b/doc/contribute.html
@@ -105,6 +105,8 @@ cd $GOROOT/src/pkg
 </pre>
 <p>
 to update the dependency file <code>Make.deps</code>.
+(This happens automatically each time you run <code>all.bash</code>
+or <code>make.bash</code>.)
 </p>
 
 <p>

diff --git a/src/make.bash b/src/make.bash
index 2038fe2394932785327b7806276edd68af9ec6f9..249a9cee2583bf9605f769eabd09f1a9d02d9011 100755 (executable)
--- a/src/make.bash
+++ b/src/make.bash
@@ -90,6 +90,10 @@ do
                        cmd)
                                bash make.bash
                                ;;
+                       pkg)
+                               bash deps.bash
+                               gomake install
+                               ;;
                        *)
                                gomake install
                        esac

diff --git a/src/pkg/Make.deps b/src/pkg/Make.deps
deleted file mode 100644 (file)
index c8caf78..0000000
--- a/src/pkg/Make.deps
+++ /dev/null
@@ -1,85 +0,0 @@
-archive/tar.install: bytes.install io.install os.install strconv.install strings.install
-asn1.install: bytes.install fmt.install io.install os.install reflect.install strconv.install strings.install time.install
-big.install: rand.install
-bignum.install: fmt.install
-bufio.install: bytes.install io.install os.install strconv.install utf8.install
-bytes.install: os.install unicode.install utf8.install
-compress/flate.install: bufio.install io.install math.install os.install sort.install strconv.install
-compress/gzip.install: bufio.install compress/flate.install hash.install hash/crc32.install io.install os.install
-compress/zlib.install: bufio.install compress/flate.install hash.install hash/adler32.install io.install os.install
-container/heap.install: sort.install
-container/list.install:
-container/ring.install:
-container/vector.install:
-crypto/aes.install: os.install strconv.install
-crypto/block.install: fmt.install hash.install io.install os.install strconv.install
-crypto/hmac.install: crypto/md5.install crypto/sha1.install hash.install os.install
-crypto/md5.install: hash.install os.install
-crypto/rc4.install: os.install strconv.install
-crypto/rsa.install: big.install crypto/subtle.install hash.install io.install os.install
-crypto/sha1.install: hash.install os.install
-crypto/subtle.install:
-crypto/tls.install: bufio.install container/list.install crypto/hmac.install crypto/md5.install crypto/rc4.install crypto/rsa.install crypto/sha1.install crypto/subtle.install fmt.install hash.install io.install net.install os.install strings.install time.install
-crypto/x509.install: asn1.install big.install container/vector.install crypto/rsa.install crypto/sha1.install hash.install os.install strings.install time.install
-debug/dwarf.install: encoding/binary.install os.install strconv.install
-debug/macho.install: bytes.install debug/dwarf.install encoding/binary.install fmt.install io.install os.install strconv.install
-debug/elf.install: bytes.install debug/dwarf.install encoding/binary.install fmt.install io.install os.install strconv.install
-debug/gosym.install: encoding/binary.install fmt.install os.install strconv.install strings.install
-debug/proc.install: container/vector.install fmt.install io.install os.install runtime.install strconv.install strings.install sync.install syscall.install
-ebnf.install: container/vector.install go/scanner.install go/token.install os.install strconv.install unicode.install utf8.install
-encoding/ascii85.install: io.install os.install strconv.install
-encoding/base64.install: io.install os.install strconv.install
-encoding/binary.install: io.install math.install os.install reflect.install
-encoding/git85.install: bytes.install io.install os.install strconv.install
-encoding/hex.install: os.install strconv.install strings.install
-encoding/pem.install: bytes.install encoding/base64.install strings.install
-exec.install: os.install strings.install
-exp/datafmt.install: bytes.install container/vector.install fmt.install go/scanner.install go/token.install io.install os.install reflect.install runtime.install strconv.install strings.install
-exp/eval.install: bignum.install fmt.install go/ast.install go/parser.install go/scanner.install go/token.install log.install os.install reflect.install runtime.install sort.install strconv.install strings.install
-exp/iterable.install: container/vector.install
-expvar.install: bytes.install fmt.install http.install log.install strconv.install sync.install
-flag.install: fmt.install os.install strconv.install
-fmt.install: io.install os.install reflect.install strconv.install utf8.install
-go/ast.install: fmt.install go/token.install unicode.install utf8.install
-go/doc.install: container/vector.install go/ast.install go/token.install io.install regexp.install sort.install strings.install template.install
-go/parser.install: bytes.install container/vector.install fmt.install go/ast.install go/scanner.install go/token.install io.install os.install path.install strings.install
-go/printer.install: bytes.install fmt.install go/ast.install go/token.install io.install os.install reflect.install runtime.install strings.install tabwriter.install
-go/scanner.install: bytes.install container/vector.install fmt.install go/token.install io.install os.install sort.install strconv.install unicode.install utf8.install
-go/token.install: fmt.install strconv.install
-gob.install: bytes.install fmt.install io.install math.install os.install reflect.install sync.install
-hash.install: io.install
-hash/adler32.install: hash.install os.install
-hash/crc32.install: hash.install os.install
-http.install: bufio.install bytes.install container/vector.install fmt.install io.install log.install net.install os.install path.install strconv.install strings.install utf8.install
-image.install:
-image/png.install: bufio.install compress/zlib.install hash.install hash/crc32.install image.install io.install os.install strconv.install
-io.install: bytes.install os.install sort.install strings.install sync.install
-json.install: bytes.install container/vector.install fmt.install math.install reflect.install strconv.install strings.install utf8.install
-log.install: fmt.install io.install os.install runtime.install time.install
-malloc.install:
-math.install:
-net.install: fmt.install io.install once.install os.install reflect.install sync.install syscall.install
-once.install: sync.install
-os.install: once.install syscall.install
-patch.install: bytes.install compress/zlib.install crypto/sha1.install encoding/git85.install fmt.install io.install os.install path.install strings.install
-path.install: io.install os.install strings.install
-rand.install: math.install
-reflect.install: runtime.install strconv.install
-regexp.install: bytes.install container/vector.install io.install os.install utf8.install
-rpc.install: bufio.install fmt.install gob.install http.install io.install log.install net.install os.install reflect.install sort.install strings.install sync.install template.install unicode.install utf8.install
-runtime.install:
-sort.install:
-strconv.install: bytes.install math.install os.install strings.install unicode.install utf8.install
-strings.install: os.install unicode.install utf8.install
-sync.install: runtime.install
-syscall.install: sync.install
-tabwriter.install: bytes.install container/vector.install io.install os.install utf8.install
-template.install: bytes.install container/vector.install fmt.install io.install os.install reflect.install runtime.install strings.install
-testing.install: flag.install fmt.install os.install runtime.install utf8.install
-testing/iotest.install: io.install log.install os.install
-testing/quick.install: flag.install fmt.install math.install os.install rand.install reflect.install strings.install
-testing/script.install: fmt.install os.install rand.install reflect.install strings.install
-time.install: io.install once.install os.install syscall.install
-unicode.install:
-utf8.install: unicode.install
-xml.install: bufio.install bytes.install io.install os.install reflect.install strconv.install strings.install unicode.install utf8.install