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

1 files changed, 15 insertions, 11 deletions

diff --git a/src/lib/http/Makefile b/src/lib/http/Makefile
index 533305adc8..9de40c4689 100644
--- a/src/lib/http/Makefile
+++ b/src/lib/http/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
@@ -52,27 +54,28 @@ O4=\
 
 
 phases: a1 a2 a3 a4
-http.a: phases
+_obj$D/http.a: phases
 
 a1: $(O1)
-	$(AR) grc http.a status.$O url.$O
+	$(AR) grc _obj$D/http.a status.$O url.$O
 	rm -f $(O1)
 
 a2: $(O2)
-	$(AR) grc http.a request.$O
+	$(AR) grc _obj$D/http.a request.$O
 	rm -f $(O2)
 
 a3: $(O3)
-	$(AR) grc http.a server.$O
+	$(AR) grc _obj$D/http.a server.$O
 	rm -f $(O3)
 
 a4: $(O4)
-	$(AR) grc http.a fs.$O
+	$(AR) grc _obj$D/http.a fs.$O
 	rm -f $(O4)
 
 
 newpkg: clean
-	$(AR) grc http.a
+	mkdir -p _obj$D
+	$(AR) grc _obj$D/http.a
 
 $(O1): newpkg
 $(O2): a1
@@ -81,9 +84,10 @@ $(O4): a3
 $(O5): a4
 
 nuke: clean
-	rm -f $(GOROOT)/pkg/http.a
+	rm -f $(GOROOT)/pkg$D/http.a
 
-packages: http.a
+packages: _obj$D/http.a
 
 install: packages
-	cp http.a $(GOROOT)/pkg/http.a
+	test -d $(GOROOT)/pkg && mkdir -p $(GOROOT)/pkg$D
+	cp _obj$D/http.a $(GOROOT)/pkg$D/http.a