diff options
| author | Russ Cox <rsc@golang.org> | 2009-04-16 20:52:37 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2009-04-16 20:52:37 -0700 |
| commit | 1f6463f823edd3b194a85d13e5eed068f4a129ed (patch) | |
| tree | fc0d1bfb34a87c27e16c2bc4978b7cf4dd7b134e /src/lib/strconv | |
| parent | 0f153ec6b47382f4df8f3b62acdee89208d97584 (diff) | |
| download | go-1f6463f823edd3b194a85d13e5eed068f4a129ed.tar.xz | |
Convert go tree to hierarchical pkg directory:
import (
"vector" -> "container/vector"
"ast" -> "go/ast"
"sha1" -> "hash/sha1"
etc.
)
and update Makefiles. Because I did the conversion
semi-automatically, I sorted all the import blocks
as a post-processing. Some files have therefore
changed that didn't strictly need to.
Rename local packages to lower case.
The upper/lower distinction doesn't work on OS X
and complicates the "single-package directories
with the same package name as directory name"
heuristic used by gobuild and godoc to create
the correlation between source and binary locations.
Now that we have a plan to avoid globally unique
names, the upper/lower is unnecessary.
The renamings will cause trouble for a few users,
but so will the change in import paths.
This way, the two maintenance fixes are rolled into
one inconvenience.
R=r
OCL=27573
CL=27575
Diffstat (limited to 'src/lib/strconv')
| -rw-r--r-- | src/lib/strconv/Makefile | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/src/lib/strconv/Makefile b/src/lib/strconv/Makefile index b8359f27d6..956c479123 100644 --- a/src/lib/strconv/Makefile +++ b/src/lib/strconv/Makefile @@ -5,13 +5,15 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile +D= + O_arm=5 O_amd64=6 O_386=8 OS=568vq O=$(O_$(GOARCH)) -GC=$(O)g +GC=$(O)g -I_obj CC=$(O)c -FVw AS=$(O)a AR=6ar @@ -19,7 +21,7 @@ AR=6ar default: packages clean: - rm -f *.[$(OS)] *.a [$(OS)].out + rm -rf *.[$(OS)] *.a [$(OS)].out _obj test: packages gotest @@ -51,23 +53,24 @@ O3=\ phases: a1 a2 a3 -strconv.a: phases +_obj$D/strconv.a: phases a1: $(O1) - $(AR) grc strconv.a atoi.$O decimal.$O itoa.$O quote.$O + $(AR) grc _obj$D/strconv.a atoi.$O decimal.$O itoa.$O quote.$O rm -f $(O1) a2: $(O2) - $(AR) grc strconv.a ftoa.$O + $(AR) grc _obj$D/strconv.a ftoa.$O rm -f $(O2) a3: $(O3) - $(AR) grc strconv.a atof.$O + $(AR) grc _obj$D/strconv.a atof.$O rm -f $(O3) newpkg: clean - $(AR) grc strconv.a + mkdir -p _obj$D + $(AR) grc _obj$D/strconv.a $(O1): newpkg $(O2): a1 @@ -75,9 +78,10 @@ $(O3): a2 $(O4): a3 nuke: clean - rm -f $(GOROOT)/pkg/strconv.a + rm -f $(GOROOT)/pkg$D/strconv.a -packages: strconv.a +packages: _obj$D/strconv.a install: packages - cp strconv.a $(GOROOT)/pkg/strconv.a + test -d $(GOROOT)/pkg && mkdir -p $(GOROOT)/pkg$D + cp _obj$D/strconv.a $(GOROOT)/pkg$D/strconv.a |