4 files changed, 5 insertions, 73 deletions
diff --git a/src/pkg/go/parser/Makefile b/src/pkg/go/parser/Makefile
index 5e5c51a5a..a8f14ff63 100644
--- a/src/pkg/go/parser/Makefile
+++ b/src/pkg/go/parser/Makefile
@@ -2,68 +2,11 @@
 # 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 parser.go interface.go >Makefile
-
-D=/go/
-
 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=\
-	parser.$O\
-
-O2=\
-	interface.$O\
-
-
-phases: a1 a2
-_obj$D/parser.a: phases
-
-a1: $(O1)
-	$(AR) grc _obj$D/parser.a parser.$O
-	rm -f $(O1)
-
-a2: $(O2)
-	$(AR) grc _obj$D/parser.a interface.$O
-	rm -f $(O2)
-
-
-newpkg: clean
-	mkdir -p _obj$D
-	$(AR) grc _obj$D/parser.a
-
-$(O1): newpkg
-$(O2): a1
-$(O3): a2
-
-nuke: clean
-	rm -f $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/parser.a
 
-packages: _obj$D/parser.a
+TARG=go/parser
+GOFILES=\
+	interface.go\
+	parser.go\
 
-install: packages
-	test -d $(GOROOT)/pkg && mkdir -p $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D
-	cp _obj$D/parser.a $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/parser.a
+include $(GOROOT)/src/Make.pkg
diff --git a/src/pkg/go/parser/interface.go b/src/pkg/go/parser/interface.go
index 5fa60c1cd..94835b8ec 100644
--- a/src/pkg/go/parser/interface.go
+++ b/src/pkg/go/parser/interface.go
@@ -10,7 +10,6 @@ import (
 	"bytes";
 	"fmt";
 	"go/ast";
-	"go/parser";
 	"go/scanner";
 	"io";
 	"os";
diff --git a/src/pkg/go/parser/parser.go b/src/pkg/go/parser/parser.go
index f0fa487cc..537832209 100644
--- a/src/pkg/go/parser/parser.go
+++ b/src/pkg/go/parser/parser.go
@@ -74,8 +74,6 @@ func scannerMode(mode uint) uint {
 }
 
 
-func (p *parser) next()
-
 func (p *parser) init(filename string, src []byte, mode uint) {
 	p.ErrorVector.Init();
 	p.scanner.Init(filename, src, p, scannerMode(mode));
@@ -267,13 +265,6 @@ func (p *parser) expect(tok token.Token) token.Position {
 // ----------------------------------------------------------------------------
 // Common productions
 
-func (p *parser) tryType() ast.Expr
-func (p *parser) parseStringList(x *ast.StringLit) []*ast.StringLit
-func (p *parser) parseExpr() ast.Expr
-func (p *parser) parseStmt() ast.Stmt
-func (p *parser) parseDecl(getSemi bool) (decl ast.Decl, gotSemi bool)
-
-
 func (p *parser) parseIdent() *ast.Ident {
 	if p.tok == token.IDENT {
 		x := &ast.Ident{p.pos, string(p.lit)};
diff --git a/src/pkg/go/parser/parser_test.go b/src/pkg/go/parser/parser_test.go
index 29719b6de..7a0b24d07 100644
--- a/src/pkg/go/parser/parser_test.go
+++ b/src/pkg/go/parser/parser_test.go
@@ -6,7 +6,6 @@ package parser
 
 import (
 	"go/ast";
-	"go/parser";
 	"os";
 	"testing";
 )