all: remove some references to Make.inc etc.

There are a few more but these are the easiest ones.

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/5756067

src/cmd/cgo/doc.go

@@ -111,9 +111,9 @@ Not all Go types can be mapped to C types in a useful way.
 Cgo transforms the input file into four output files: two Go source
 files, a C file for 6c (or 8c or 5c), and a C file for gcc.
 
-The standard package makefile rules in Make.pkg automate the
+The standard package construction rules of the go command
-process of using cgo.  See $GOROOT/misc/cgo/stdio and
+automate the process of using cgo.  See $GOROOT/misc/cgo/stdio
-$GOROOT/misc/cgo/gmp for examples.
+and $GOROOT/misc/cgo/gmp for examples.
 
 Cgo does not yet work with gccgo.
 

src/cmd/cgo/main.go

@@ -147,7 +147,7 @@ func main() {
 		// cgo -dynimport is essentially a separate helper command
 		// built into the cgo binary.  It scans a gcc-produced executable
 		// and dumps information about the imported symbols and the
-		// imported libraries.  The Make.pkg rules for cgo prepare an
+		// imported libraries.  The 'go build' rules for cgo prepare an
 		// appropriate executable and then use its import information
 		// instead of needing to make the linkers duplicate all the
 		// specialized knowledge gcc has about where to look for imported

src/lib9/utf/Makefile

@@ -4,21 +4,17 @@
 
 # The library is built by the Makefile in the parent directory.
 # This Makefile only builds mkrunetype.
-
+# GOROOT, GOOS, and GOARCH must be set explicitly.
-include ../../Make.inc
-O:=$(HOST_O)
 
 TARG=mkrunetype
 
-OFILES=\
-	mkrunetype.$O\
-
-include ../../Make.ccmd
-
 UnicodeData-%.txt:
 	curl http://www.unicode.org/Public/$*/ucd/UnicodeData.txt >_$@
 	mv _$@ $@
 
+mkrunetype: mkrunetype.c
+	cc -I../../../include -o mkrunetype -L$(GOROOT)/pkg/obj/$(GOOS)_$(GOARCH)/ mkrunetype.c -l9
+
 runetypebody-%.c: mkrunetype UnicodeData-%.txt
 	mkrunetype -p UnicodeData-$*.txt >_$@
 	mv _$@ $@
@@ -30,3 +26,5 @@ UNICODE_VERSION=6.0.0
 test: mkrunetype UnicodeData-$(UNICODE_VERSION).txt
 	mkrunetype -c UnicodeData-$(UNICODE_VERSION).txt
 
+clean:
+	rm -f UnicodeData.txt mkrunetype

test/bench/garbage/Makefile

@@ -2,27 +2,22 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ../../../src/Make.inc
-
 ALL=\
 	parser\
 	peano\
 	tree\
 	tree2\
 
-all: $(addsuffix .out, $(ALL))
+all: $(ALL)
 
-%.$O: %.go stats.go
+%: %.go
-	$(GC) $(GCFLAGS) $(GCIMPORTS) $*.go stats.go
+	go build $*.go stats.go
 
-%.out: %.$O
+%.bench: %
-	$(LD) -o $@ $*.$O
+	time ./$*
-
-%.bench: %.out
-	time ./$*.out
 
 bench: $(addsuffix .bench, $(ALL))
 
 clean:
-	rm -f *.[$(OS)] $(addsuffix .out, $(ALL))
+	rm -f $(ALL)
 

test/bench/go1/Makefile

@@ -1,10 +1,5 @@
-include $(GOROOT)/src/Make.inc
 
 TARG=go1
-GOFILES=\
-	dummy.go\
-
-include $(GOROOT)/src/Make.pkg
 
 test:
 	echo go1: tests disabled for now TODO