4 files changed, 7 insertions, 71 deletions
diff --git a/src/pkg/unicode/Makefile b/src/pkg/unicode/Makefile
index de1677b8d..7ab29c6c4 100644
--- a/src/pkg/unicode/Makefile
+++ b/src/pkg/unicode/Makefile
@@ -2,67 +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 >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=\
-	letter.$O\
-
-O2=\
-	decimaldigit.$O\
-
-
-phases: a1 a2
-_obj$D/unicode.a: phases
-
-a1: $(O1)
-	$(AR) grc _obj$D/unicode.a letter.$O
-	rm -f $(O1)
-
-a2: $(O2)
-	$(AR) grc _obj$D/unicode.a decimaldigit.$O
-	rm -f $(O2)
-
-
-newpkg: clean
-	mkdir -p _obj$D
-	$(AR) grc _obj$D/unicode.a
-
-$(O1): newpkg
-$(O2): a1
-$(O3): a2
-
-nuke: clean
-	rm -f $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/unicode.a
 
-packages: _obj$D/unicode.a
+TARG=unicode
+GOFILES=\
+	decimaldigit.go\
+	letter.go\
 
-install: packages
-	test -d $(GOROOT)/pkg && mkdir -p $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D
-	cp _obj$D/unicode.a $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/unicode.a
+include $(GOROOT)/src/Make.pkg
diff --git a/src/pkg/unicode/decimaldigit.go b/src/pkg/unicode/decimaldigit.go
index 1165e3ae1..ab65b433d 100644
--- a/src/pkg/unicode/decimaldigit.go
+++ b/src/pkg/unicode/decimaldigit.go
@@ -9,8 +9,6 @@ package unicode
 // These ranges are the characters with the third field "Nd".
 // Should generate automatically etc.
 
-import "unicode"
-
 // Decimal digit is the set of Unicode characters with the "decimal digit" property.
 var DecimalDigit = []Range{
 	Range{0x0030, 0x0039, 1},
diff --git a/src/pkg/unicode/decimaldigit_test.go b/src/pkg/unicode/decimaldigit_test.go
index 393846e2e..05d75b4b2 100644
--- a/src/pkg/unicode/decimaldigit_test.go
+++ b/src/pkg/unicode/decimaldigit_test.go
@@ -4,10 +4,7 @@
 
 package unicode
 
-import (
-	"testing";
-	"unicode";
-)
+import "testing"
 
 // To get data:
 //	grep '^....;[^;]*;Nd;' UnicodeData.txt
diff --git a/src/pkg/unicode/letter_test.go b/src/pkg/unicode/letter_test.go
index 8e4290d6d..15a0a0eed 100644
--- a/src/pkg/unicode/letter_test.go
+++ b/src/pkg/unicode/letter_test.go
@@ -4,10 +4,7 @@
 
 package unicode
 
-import (
-	"testing";
-	"unicode";
-)
+import "testing"
 
 var upper = []int{
 	0x41,