convert non-low-level non-google pkg code

to whole-package compilation.

R=r
OCL=33070
CL=33101

1 files changed, 13 insertions, 76 deletions

diff --git a/src/pkg/crypto/block/Makefile b/src/pkg/crypto/block/Makefile
index e8bc8e907..a277d0dd9 100644
--- a/src/pkg/crypto/block/Makefile
+++ b/src/pkg/crypto/block/Makefile
@@ -2,81 +2,18 @@
 # 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=/crypto/
-
 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=\
-	cipher.$O\
-	xor.$O\
-
-O2=\
-	cmac.$O\
-	ctr.$O\
-	ecb.$O\
-	ofb.$O\
-
-O3=\
-	cbc.$O\
-	cfb.$O\
-	eax.$O\
-
-
-phases: a1 a2 a3
-_obj$D/block.a: phases
-
-a1: $(O1)
-	$(AR) grc _obj$D/block.a cipher.$O xor.$O
-	rm -f $(O1)
-
-a2: $(O2)
-	$(AR) grc _obj$D/block.a cmac.$O ctr.$O ecb.$O ofb.$O
-	rm -f $(O2)
-
-a3: $(O3)
-	$(AR) grc _obj$D/block.a cbc.$O cfb.$O eax.$O
-	rm -f $(O3)
-
-
-newpkg: clean
-	mkdir -p _obj$D
-	$(AR) grc _obj$D/block.a
-
-$(O1): newpkg
-$(O2): a1
-$(O3): a2
-$(O4): a3
-
-nuke: clean
-	rm -f $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/block.a
-
-packages: _obj$D/block.a
 
-install: packages
-	test -d $(GOROOT)/pkg && mkdir -p $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D
-	cp _obj$D/block.a $(GOROOT)/pkg/$(GOOS)_$(GOARCH)$D/block.a
+TARG=crypto/block
+GOFILES=\
+	cbc.go\
+	cfb.go\
+	cipher.go\
+	cmac.go\
+	ctr.go\
+	eax.go\
+	ecb.go\
+	ofb.go\
+	xor.go\
+
+include $(GOROOT)/src/Make.pkg