makefile fixes

R=r
OCL=28369
CL=28369

diff --git a/src/lib/Makefile b/src/lib/Makefile
index a03e354a605e9e8813841648bee52a00370bf50b..aee267dc99ee51d1be15d6720d7cfa73da89df6d 100644 (file)
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -14,7 +14,11 @@ DIRS=\
        exvar\
        flag\
        fmt\
-       go\
+       go/ast \
+       go/doc \
+       go/parser \
+       go/scanner \
+       go/token \
        hash\
        http\
        io\
@@ -41,35 +45,36 @@ DIRS=\
        utf8\
 
 TEST=\
-       bignum \
-       bufio \
-       container/vector \
-       exec \
-       exvar \
-       flag \
-       fmt \
-       go \
-       hash \
-       http \
-       io \
-       json \
-       log \
-       math \
-       net \
-       once \
-       os \
-       path \
-       reflect \
-       regexp \
-       sort \
-       strconv \
-       strings \
-       sync \
-       tabwriter \
-       template \
-       time \
-       unicode \
-       utf8 \
+       bignum\
+       bufio\
+       container/vector\
+       exec\
+       exvar\
+       flag\
+       fmt\
+       go/parser\
+       go/scanner\
+       hash\
+       http\
+       io\
+       json\
+       log\
+       math\
+       net\
+       once\
+       os\
+       path\
+       reflect\
+       regexp\
+       sort\
+       strconv\
+       strings\
+       sync\
+       tabwriter\
+       template\
+       time\
+       unicode\
+       utf8\
 
 clean.dirs: $(addsuffix .clean, $(DIRS))
 install.dirs: $(addsuffix .install, $(DIRS))
@@ -111,8 +116,13 @@ strings.install: utf8.install
 testing.install: flag.install fmt.install
 
 fmt.install: io.install reflect.install strconv.install
-go.install: fmt.install io.install once.install regexp.install sort.install \
+GODEPS=fmt.install io.install once.install regexp.install sort.install \
        strconv.install strings.install unicode.install utf8.install container/vector.install
+go/scanner.install: go/token.install $(GODEPS)
+go/parser.install: go/ast.install go/scanner.install go/token.install $(GODEPS)
+go/doc.install: go/ast.install go/token.install $(GODEPS)
+go/ast.install: go/token.install $(GODEPS)
+go/token.install: $(GODEPS)
 hash.install: os.install
 http.install: bufio.install io.install net.install os.install path.install strings.install log.install
 io.install: os.install sync.install

diff --git a/src/lib/go/Makefile b/src/lib/go/Makefile
deleted file mode 100644 (file)
index d779c1f..0000000
--- a/src/lib/go/Makefile
+++ /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.
-
-all: install
-
-GC=6g
-
-DIRS=\
-       ast \
-       doc \
-       parser \
-       scanner \
-       token \
-
-
-TEST=\
-       parser \
-       scanner \
-
-clean.dirs: $(addsuffix .clean, $(DIRS))
-install.dirs: $(addsuffix .install, $(DIRS))
-test.dirs: $(addsuffix .test, $(TEST))
-
-%.clean:
-       +cd $* && make clean
-
-%.install:
-       +cd $* && make install
-
-%.test:
-       +cd $* && make test
-
-clean: clean.dirs
-
-install: install.dirs
-
-test:  test.dirs
-
-# TODO: dependencies - should auto-generate
-
-scanner.install: token.install
-parser.install:        ast.install scanner.install token.install
-doc.install: ast.install token.install
-ast.install: token.install