convert non-low-level non-google pkg code

to whole-package compilation.

R=r
OCL=33070
CL=33101

5 files changed, 6 insertions, 68 deletions

diff --git a/src/pkg/rpc/Makefile b/src/pkg/rpc/Makefile
index a06250326..9ea178238 100644
--- a/src/pkg/rpc/Makefile
+++ b/src/pkg/rpc/Makefile
@@ -2,69 +2,12 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-
-# DO NOT EDIT.  Automatically generated by gobuild.
-# gobuild -m >Makefile
-
-D=
-
 include $(GOROOT)/src/Make.$(GOARCH)
-AR=gopack
-
-default: packages
-
-clean:
-	rm -rf *.[$(OS)] *.a [$(OS)].out _obj
-
-test: packages
-	gotest
-
-coverage: packages
-	gotest
-	6cov -g $$(pwd) | grep -v '_test\.go:'
-
-%.$O: %.go
-	$(GC) -I_obj $*.go
-
-%.$O: %.c
-	$(CC) $*.c
-
-%.$O: %.s
-	$(AS) $*.s
-
-O1=\
-	server.$O\
-
-O2=\
-	client.$O\
-	debug.$O\
-
-
-phases: a1 a2
-_obj$D/rpc.a: phases
-
-a1: $(O1)
-	$(AR) grc _obj$D/rpc.a server.$O
-	rm -f $(O1)
-
-a2: $(O2)
-	$(AR) grc _obj$D/rpc.a client.$O debug.$O
-	rm -f $(O2)
-
-
-newpkg: clean
-	mkdir -p _obj$D
-	$(AR) grc _obj$D/rpc.a
-
-$(O1): newpkg
-$(O2): a1
-$(O3): a2
-
-nuke: clean
-	rm -f $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/rpc.a
 
-packages: _obj$D/rpc.a
+TARG=rpc
+GOFILES=\
+	client.go\
+	debug.go\
+	server.go\
 
-install: packages
-	test -d $(GOROOT)/pkg && mkdir -p $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D
-	cp _obj$D/rpc.a $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/rpc.a
+include $(GOROOT)/src/Make.pkg
diff --git a/src/pkg/rpc/client.go b/src/pkg/rpc/client.go
index 92c283e6b..5846d6b33 100644
--- a/src/pkg/rpc/client.go
+++ b/src/pkg/rpc/client.go
@@ -12,7 +12,6 @@ import (
 	"log";
 	"net";
 	"os";
-	"rpc";
 	"strconv";
 	"sync";
 )
diff --git a/src/pkg/rpc/debug.go b/src/pkg/rpc/debug.go
index 3b927cf24..990bd1f9c 100644
--- a/src/pkg/rpc/debug.go
+++ b/src/pkg/rpc/debug.go
@@ -16,7 +16,6 @@ import (
 	"io";
 	"log";
 	"os";
-	"rpc";
 	"sort";
 	"template";
 )
diff --git a/src/pkg/rpc/server.go b/src/pkg/rpc/server.go
index d1b7de714..37afa7748 100644
--- a/src/pkg/rpc/server.go
+++ b/src/pkg/rpc/server.go
@@ -409,8 +409,6 @@ func serveHTTP(c *http.Conn, req *http.Request) {
 	server.input(conn);
 }
 
-func debugHTTP(c *http.Conn, req *http.Request)
-
 // HandleHTTP registers an HTTP handler for RPC messages.
 // It is still necessary to invoke http.Serve(), typically in a go statement.
 func HandleHTTP() {
diff --git a/src/pkg/rpc/server_test.go b/src/pkg/rpc/server_test.go
index e21680eb6..ff5de90c8 100644
--- a/src/pkg/rpc/server_test.go
+++ b/src/pkg/rpc/server_test.go
@@ -12,7 +12,6 @@ import (
 	"net";
 	"once";
 	"os";
-	"rpc";
 	"strings";
 	"testing";
 )