aboutsummaryrefslogtreecommitdiff
path: root/src/lib/sync
diff options
context:
space:
mode:
authorRuss Cox <rsc@golang.org>2009-04-16 20:52:37 -0700
committerRuss Cox <rsc@golang.org>2009-04-16 20:52:37 -0700
commit1f6463f823edd3b194a85d13e5eed068f4a129ed (patch)
treefc0d1bfb34a87c27e16c2bc4978b7cf4dd7b134e /src/lib/sync
parent0f153ec6b47382f4df8f3b62acdee89208d97584 (diff)
downloadgo-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/sync')
-rw-r--r--src/lib/sync/Makefile20
1 files changed, 12 insertions, 8 deletions
diff --git a/src/lib/sync/Makefile b/src/lib/sync/Makefile
index 9a785c1c8e..e8e45ad476 100644
--- a/src/lib/sync/Makefile
+++ b/src/lib/sync/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
@@ -43,23 +45,25 @@ O1=\
phases: a1
-sync.a: phases
+_obj$D/sync.a: phases
a1: $(O1)
- $(AR) grc sync.a asm_$(GOARCH).$O mutex.$O
+ $(AR) grc _obj$D/sync.a asm_$(GOARCH).$O mutex.$O
rm -f $(O1)
newpkg: clean
- $(AR) grc sync.a
+ mkdir -p _obj$D
+ $(AR) grc _obj$D/sync.a
$(O1): newpkg
$(O2): a1
nuke: clean
- rm -f $(GOROOT)/pkg/sync.a
+ rm -f $(GOROOT)/pkg$D/sync.a
-packages: sync.a
+packages: _obj$D/sync.a
install: packages
- cp sync.a $(GOROOT)/pkg/sync.a
+ test -d $(GOROOT)/pkg && mkdir -p $(GOROOT)/pkg$D
+ cp _obj$D/sync.a $(GOROOT)/pkg$D/sync.a