From: Russ Cox Date: Thu, 16 Apr 2009 07:18:37 +0000 (-0700) Subject: regenerate Makefiles. X-Git-Tag: weekly.2009-11-06~1815 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=c8f93788898e61fd3d94245a3a79bfc826a32cc7;p=gostls13.git regenerate Makefiles. fix bug in RPC.go (import "RPC" not "rpc.pb") R=r DELTA=483 (261 added, 64 deleted, 158 changed) OCL=27547 CL=27549 --- diff --git a/src/lib/container/Makefile b/src/lib/container/Makefile index e5f36be77e..b62675925a 100644 --- a/src/lib/container/Makefile +++ b/src/lib/container/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -38,24 +44,28 @@ O2=\ intvector.$O\ iterable.$O\ -vector.a: a1 a2 -iterable.a: a1 a2 -a1: $(O1) +phases: a1 a2 +vector.a: phases +iterable.a: phases + +a1: $(O1) $(AR) grc vector.a vector.$O rm -f $(O1) -a2: $(O2) +a2: $(O2) $(AR) grc vector.a intvector.$O $(AR) grc iterable.a iterable.$O rm -f $(O2) + newpkg: clean $(AR) grc vector.a $(AR) grc iterable.a $(O1): newpkg $(O2): a1 +$(O3): a2 nuke: clean rm -f $(GOROOT)/pkg/vector.a $(GOROOT)/pkg/iterable.a diff --git a/src/lib/fmt/Makefile b/src/lib/fmt/Makefile index e8158189fb..f18f4cfe01 100644 --- a/src/lib/fmt/Makefile +++ b/src/lib/fmt/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -37,21 +43,25 @@ O1=\ O2=\ print.$O\ -fmt.a: a1 a2 -a1: $(O1) +phases: a1 a2 +fmt.a: phases + +a1: $(O1) $(AR) grc fmt.a format.$O rm -f $(O1) -a2: $(O2) +a2: $(O2) $(AR) grc fmt.a print.$O rm -f $(O2) + newpkg: clean $(AR) grc fmt.a $(O1): newpkg $(O2): a1 +$(O3): a2 nuke: clean rm -f $(GOROOT)/pkg/fmt.a @@ -60,4 +70,3 @@ packages: fmt.a install: packages cp fmt.a $(GOROOT)/pkg/fmt.a - diff --git a/src/lib/go/Makefile b/src/lib/go/Makefile index 2616978e3d..5cfb549855 100644 --- a/src/lib/go/Makefile +++ b/src/lib/go/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -35,30 +41,33 @@ O1=\ token.$O\ O2=\ - ast.$O\ scanner.$O\ + ast.$O\ O3=\ parser.$O\ -ast.a: a1 a2 a3 -parser.a: a1 a2 a3 -scanner.a: a1 a2 a3 -token.a: a1 a2 a3 -a1: $(O1) +phases: a1 a2 a3 +ast.a: phases +parser.a: phases +scanner.a: phases +token.a: phases + +a1: $(O1) $(AR) grc token.a token.$O rm -f $(O1) -a2: $(O2) - $(AR) grc ast.a ast.$O +a2: $(O2) $(AR) grc scanner.a scanner.$O + $(AR) grc ast.a ast.$O rm -f $(O2) -a3: $(O3) +a3: $(O3) $(AR) grc parser.a parser.$O rm -f $(O3) + newpkg: clean $(AR) grc ast.a $(AR) grc parser.a @@ -68,6 +77,7 @@ newpkg: clean $(O1): newpkg $(O2): a1 $(O3): a2 +$(O4): a3 nuke: clean rm -f $(GOROOT)/pkg/ast.a $(GOROOT)/pkg/parser.a $(GOROOT)/pkg/scanner.a $(GOROOT)/pkg/token.a @@ -79,4 +89,3 @@ install: packages cp parser.a $(GOROOT)/pkg/parser.a cp scanner.a $(GOROOT)/pkg/scanner.a cp token.a $(GOROOT)/pkg/token.a - diff --git a/src/lib/hash/Makefile b/src/lib/hash/Makefile index 589dbe5fc8..95f8caca3e 100644 --- a/src/lib/hash/Makefile +++ b/src/lib/hash/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -33,48 +39,51 @@ coverage: packages O1=\ adler32.$O\ - crc32.$O\ sha1.$O\ md5.$O\ + crc32.$O\ O2=\ - md5block.$O\ sha1block.$O\ + md5block.$O\ -adler32.a: a1 a2 -crc32.a: a1 a2 -sha1.a: a1 a2 -md5.a: a1 a2 -a1: $(O1) +phases: a1 a2 +adler32.a: phases +crc32.a: phases +md5.a: phases +sha1.a: phases + +a1: $(O1) $(AR) grc adler32.a adler32.$O - $(AR) grc crc32.a crc32.$O $(AR) grc sha1.a sha1.$O $(AR) grc md5.a md5.$O + $(AR) grc crc32.a crc32.$O rm -f $(O1) -a2: $(O2) +a2: $(O2) $(AR) grc sha1.a sha1block.$O $(AR) grc md5.a md5block.$O rm -f $(O2) + newpkg: clean $(AR) grc adler32.a $(AR) grc crc32.a - $(AR) grc sha1.a $(AR) grc md5.a + $(AR) grc sha1.a $(O1): newpkg $(O2): a1 +$(O3): a2 nuke: clean - rm -f $(GOROOT)/pkg/adler32.a $(GOROOT)/pkg/crc32.a $(GOROOT)/pkg/sha1.a $(GOROOT)/pkg/md5.a + rm -f $(GOROOT)/pkg/adler32.a $(GOROOT)/pkg/crc32.a $(GOROOT)/pkg/md5.a $(GOROOT)/pkg/sha1.a -packages: adler32.a crc32.a sha1.a md5.a +packages: adler32.a crc32.a md5.a sha1.a install: packages cp adler32.a $(GOROOT)/pkg/adler32.a cp crc32.a $(GOROOT)/pkg/crc32.a - cp sha1.a $(GOROOT)/pkg/sha1.a cp md5.a $(GOROOT)/pkg/md5.a - + cp sha1.a $(GOROOT)/pkg/sha1.a diff --git a/src/lib/http/Makefile b/src/lib/http/Makefile index 99da90816f..533305adc8 100644 --- a/src/lib/http/Makefile +++ b/src/lib/http/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -44,24 +50,27 @@ O3=\ O4=\ fs.$O\ -http.a: a1 a2 a3 a4 -a1: $(O1) +phases: a1 a2 a3 a4 +http.a: phases + +a1: $(O1) $(AR) grc http.a status.$O url.$O rm -f $(O1) -a2: $(O2) +a2: $(O2) $(AR) grc http.a request.$O rm -f $(O2) -a3: $(O3) +a3: $(O3) $(AR) grc http.a server.$O rm -f $(O3) -a4: $(O4) +a4: $(O4) $(AR) grc http.a fs.$O rm -f $(O4) + newpkg: clean $(AR) grc http.a @@ -69,6 +78,7 @@ $(O1): newpkg $(O2): a1 $(O3): a2 $(O4): a3 +$(O5): a4 nuke: clean rm -f $(GOROOT)/pkg/http.a @@ -77,4 +87,3 @@ packages: http.a install: packages cp http.a $(GOROOT)/pkg/http.a - diff --git a/src/lib/io/Makefile b/src/lib/io/Makefile index 4861fd5d68..e3e4a77f8c 100644 --- a/src/lib/io/Makefile +++ b/src/lib/io/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -38,21 +44,25 @@ O1=\ O2=\ pipe.$O\ -io.a: a1 a2 -a1: $(O1) +phases: a1 a2 +io.a: phases + +a1: $(O1) $(AR) grc io.a bytebuffer.$O io.$O rm -f $(O1) -a2: $(O2) +a2: $(O2) $(AR) grc io.a pipe.$O rm -f $(O2) + newpkg: clean $(AR) grc io.a $(O1): newpkg $(O2): a1 +$(O3): a2 nuke: clean rm -f $(GOROOT)/pkg/io.a @@ -61,4 +71,3 @@ packages: io.a install: packages cp io.a $(GOROOT)/pkg/io.a - diff --git a/src/lib/json/Makefile b/src/lib/json/Makefile index 581f9d4b62..df4157a702 100644 --- a/src/lib/json/Makefile +++ b/src/lib/json/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -38,21 +44,25 @@ O2=\ generic.$O\ struct.$O\ -json.a: a1 a2 -a1: $(O1) +phases: a1 a2 +json.a: phases + +a1: $(O1) $(AR) grc json.a parse.$O rm -f $(O1) -a2: $(O2) +a2: $(O2) $(AR) grc json.a generic.$O struct.$O rm -f $(O2) + newpkg: clean $(AR) grc json.a $(O1): newpkg $(O2): a1 +$(O3): a2 nuke: clean rm -f $(GOROOT)/pkg/json.a @@ -61,4 +71,3 @@ packages: json.a install: packages cp json.a $(GOROOT)/pkg/json.a - diff --git a/src/lib/math/Makefile b/src/lib/math/Makefile index 623626e967..56946c0c23 100644 --- a/src/lib/math/Makefile +++ b/src/lib/math/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -32,11 +38,11 @@ coverage: packages $(AS) $*.s O1=\ + const.$O\ fabs.$O\ hypot.$O\ pow10.$O\ runtime.$O\ - const.$O\ O2=\ atan.$O\ @@ -57,24 +63,27 @@ O3=\ O4=\ tanh.$O\ -math.a: a1 a2 a3 a4 -a1: $(O1) - $(AR) grc math.a fabs.$O hypot.$O pow10.$O runtime.$O const.$O +phases: a1 a2 a3 a4 +math.a: phases + +a1: $(O1) + $(AR) grc math.a const.$O fabs.$O hypot.$O pow10.$O runtime.$O rm -f $(O1) -a2: $(O2) +a2: $(O2) $(AR) grc math.a atan.$O exp.$O floor.$O fmod.$O log.$O sin.$O sqrt.$O tan.$O rm -f $(O2) -a3: $(O3) +a3: $(O3) $(AR) grc math.a asin.$O atan2.$O pow.$O sinh.$O rm -f $(O3) -a4: $(O4) +a4: $(O4) $(AR) grc math.a tanh.$O rm -f $(O4) + newpkg: clean $(AR) grc math.a @@ -82,6 +91,7 @@ $(O1): newpkg $(O2): a1 $(O3): a2 $(O4): a3 +$(O5): a4 nuke: clean rm -f $(GOROOT)/pkg/math.a @@ -90,4 +100,3 @@ packages: math.a install: packages cp math.a $(GOROOT)/pkg/math.a - diff --git a/src/lib/net/Makefile b/src/lib/net/Makefile index 8a4953c2f2..466aff8a05 100644 --- a/src/lib/net/Makefile +++ b/src/lib/net/Makefile @@ -3,18 +3,19 @@ # license that can be found in the LICENSE file. # DO NOT EDIT. Automatically generated by gobuild. -# gobuild -m dnsclient.go dnsconfig.go dnsmsg.go fd.go fd_${GOOS}.go\ -# ip.go net.go net_${GOOS}.go parse.go port.go >Makefile +# ../../cmd/gobuild/6.out -m dnsclient.go dnsconfig.go dnsmsg.go fd.go fd_${GOOS}.go ip.go net.go net_${GOOS}.go parse.go port.go >Makefile + O=6 +OS=568vq GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a AR=$(O)ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -52,28 +53,31 @@ O4=\ O5=\ dnsclient.$O\ -net.a: a1 a2 a3 a4 a5 -a1: $(O1) +phases: a1 a2 a3 a4 a5 +net.a: phases + +a1: $(O1) $(AR) grc net.a dnsmsg.$O fd_$(GOOS).$O parse.$O rm -f $(O1) -a2: $(O2) +a2: $(O2) $(AR) grc net.a fd.$O ip.$O port.$O rm -f $(O2) -a3: $(O3) +a3: $(O3) $(AR) grc net.a dnsconfig.$O net_$(GOOS).$O rm -f $(O3) -a4: $(O4) +a4: $(O4) $(AR) grc net.a net.$O rm -f $(O4) -a5: $(O5) +a5: $(O5) $(AR) grc net.a dnsclient.$O rm -f $(O5) + newpkg: clean $(AR) grc net.a @@ -82,6 +86,7 @@ $(O2): a1 $(O3): a2 $(O4): a3 $(O5): a4 +$(O6): a5 nuke: clean rm -f $(GOROOT)/pkg/net.a @@ -90,4 +95,3 @@ packages: net.a install: packages cp net.a $(GOROOT)/pkg/net.a - diff --git a/src/lib/os/Makefile b/src/lib/os/Makefile index 413a8d1b1b..55ba6a15b2 100644 --- a/src/lib/os/Makefile +++ b/src/lib/os/Makefile @@ -3,18 +3,23 @@ # license that can be found in the LICENSE file. # DO NOT EDIT. Automatically generated by gobuild. -# gobuild -m dir_${GOARCH}_${GOOS}.go env.go error.go file.go\ -# stat_${GOARCH}_${GOOS}.go time.go types.go exec.go >Makefile -O=6 +# gobuild -m dir_${GOARCH}_${GOOS}.go env.go error.go file.go stat_${GOARCH}_${GOOS}.go time.go types.go exec.go >Makefile + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -48,24 +53,27 @@ O4=\ dir_$(GOARCH)_$(GOOS).$O\ exec.$O\ -os.a: a1 a2 a3 a4 -a1: $(O1) +phases: a1 a2 a3 a4 +os.a: phases + +a1: $(O1) $(AR) grc os.a error.$O types.$O rm -f $(O1) -a2: $(O2) +a2: $(O2) $(AR) grc os.a env.$O stat_$(GOARCH)_$(GOOS).$O time.$O rm -f $(O2) -a3: $(O3) +a3: $(O3) $(AR) grc os.a file.$O rm -f $(O3) -a4: $(O4) +a4: $(O4) $(AR) grc os.a dir_$(GOARCH)_$(GOOS).$O exec.$O rm -f $(O4) + newpkg: clean $(AR) grc os.a @@ -73,6 +81,7 @@ $(O1): newpkg $(O2): a1 $(O3): a2 $(O4): a3 +$(O5): a4 nuke: clean rm -f $(GOROOT)/pkg/os.a @@ -81,4 +90,3 @@ packages: os.a install: packages cp os.a $(GOROOT)/pkg/os.a - diff --git a/src/lib/reflect/Makefile b/src/lib/reflect/Makefile index 1f6d72327a..5fd3e794c1 100644 --- a/src/lib/reflect/Makefile +++ b/src/lib/reflect/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -39,29 +45,33 @@ O2=\ value.$O\ O3=\ - tostring.$O\ deepequal.$O\ + tostring.$O\ -reflect.a: a1 a2 a3 -a1: $(O1) +phases: a1 a2 a3 +reflect.a: phases + +a1: $(O1) $(AR) grc reflect.a type.$O typestring.$O rm -f $(O1) -a2: $(O2) +a2: $(O2) $(AR) grc reflect.a value.$O rm -f $(O2) -a3: $(O3) - $(AR) grc reflect.a tostring.$O deepequal.$O +a3: $(O3) + $(AR) grc reflect.a deepequal.$O tostring.$O rm -f $(O3) + newpkg: clean $(AR) grc reflect.a $(O1): newpkg $(O2): a1 $(O3): a2 +$(O4): a3 nuke: clean rm -f $(GOROOT)/pkg/reflect.a @@ -70,4 +80,3 @@ packages: reflect.a install: packages cp reflect.a $(GOROOT)/pkg/reflect.a - diff --git a/src/lib/regexp/Makefile b/src/lib/regexp/Makefile index 6b63b7dcff..86cf44a28d 100644 --- a/src/lib/regexp/Makefile +++ b/src/lib/regexp/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -34,16 +40,20 @@ coverage: packages O1=\ regexp.$O\ -regexp.a: a1 -a1: $(O1) +phases: a1 +regexp.a: phases + +a1: $(O1) $(AR) grc regexp.a regexp.$O rm -f $(O1) + newpkg: clean $(AR) grc regexp.a $(O1): newpkg +$(O2): a1 nuke: clean rm -f $(GOROOT)/pkg/regexp.a @@ -52,4 +62,3 @@ packages: regexp.a install: packages cp regexp.a $(GOROOT)/pkg/regexp.a - diff --git a/src/lib/strconv/Makefile b/src/lib/strconv/Makefile index cf74d58f73..b8359f27d6 100644 --- a/src/lib/strconv/Makefile +++ b/src/lib/strconv/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -33,8 +39,8 @@ coverage: packages O1=\ atoi.$O\ - itoa.$O\ decimal.$O\ + itoa.$O\ quote.$O\ O2=\ @@ -43,26 +49,30 @@ O2=\ O3=\ atof.$O\ -strconv.a: a1 a2 a3 -a1: $(O1) - $(AR) grc strconv.a atoi.$O itoa.$O decimal.$O quote.$O +phases: a1 a2 a3 +strconv.a: phases + +a1: $(O1) + $(AR) grc strconv.a atoi.$O decimal.$O itoa.$O quote.$O rm -f $(O1) -a2: $(O2) +a2: $(O2) $(AR) grc strconv.a ftoa.$O rm -f $(O2) -a3: $(O3) +a3: $(O3) $(AR) grc strconv.a atof.$O rm -f $(O3) + newpkg: clean $(AR) grc strconv.a $(O1): newpkg $(O2): a1 $(O3): a2 +$(O4): a3 nuke: clean rm -f $(GOROOT)/pkg/strconv.a @@ -71,4 +81,3 @@ packages: strconv.a install: packages cp strconv.a $(GOROOT)/pkg/strconv.a - diff --git a/src/lib/sync/Makefile b/src/lib/sync/Makefile index 86aeeef8b1..9a785c1c8e 100644 --- a/src/lib/sync/Makefile +++ b/src/lib/sync/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -35,16 +41,20 @@ O1=\ asm_$(GOARCH).$O\ mutex.$O\ -sync.a: a1 -a1: $(O1) +phases: a1 +sync.a: phases + +a1: $(O1) $(AR) grc sync.a asm_$(GOARCH).$O mutex.$O rm -f $(O1) + newpkg: clean $(AR) grc sync.a $(O1): newpkg +$(O2): a1 nuke: clean rm -f $(GOROOT)/pkg/sync.a @@ -53,4 +63,3 @@ packages: sync.a install: packages cp sync.a $(GOROOT)/pkg/sync.a - diff --git a/src/lib/syscall/Makefile b/src/lib/syscall/Makefile index 194fcca764..ba2a8606c0 100644 --- a/src/lib/syscall/Makefile +++ b/src/lib/syscall/Makefile @@ -3,20 +3,23 @@ # license that can be found in the LICENSE file. # DO NOT EDIT. Automatically generated by gobuild. -# gobuild -m errstr_${GOOS}.go file_${GOOS}.go socket_${GOOS}.go\ -# syscall_${GOARCH}_${GOOS}.go time_${GOARCH}_${GOOS}.go types_${GOARCH}_${GOOS}.go\ -# asm_${GOARCH}_${GOOS}.s syscall.go signal_${GOARCH}_${GOOS}.go\ -# exec.go >Makefile -O=6 +# gobuild -m errstr_${GOOS}.go file_${GOOS}.go socket_${GOOS}.go syscall_${GOARCH}_${GOOS}.go time_${GOARCH}_${GOOS}.go types_${GOARCH}_${GOOS}.go asm_${GOARCH}_${GOOS}.s syscall.go signal_${GOARCH}_${GOOS}.go exec.go >Makefile + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -35,11 +38,11 @@ coverage: packages $(AS) $*.s O1=\ - errstr_$(GOOS).$O\ - syscall_$(GOARCH)_$(GOOS).$O\ asm_$(GOARCH)_$(GOOS).$O\ - syscall.$O\ + errstr_$(GOOS).$O\ signal_$(GOARCH)_$(GOOS).$O\ + syscall.$O\ + syscall_$(GOARCH)_$(GOOS).$O\ O2=\ types_$(GOARCH)_$(GOOS).$O\ @@ -52,24 +55,27 @@ O3=\ O4=\ exec.$O\ -syscall.a: a1 a2 a3 a4 -a1: $(O1) - $(AR) grc syscall.a errstr_$(GOOS).$O syscall_$(GOARCH)_$(GOOS).$O asm_$(GOARCH)_$(GOOS).$O syscall.$O signal_$(GOARCH)_$(GOOS).$O +phases: a1 a2 a3 a4 +syscall.a: phases + +a1: $(O1) + $(AR) grc syscall.a asm_$(GOARCH)_$(GOOS).$O errstr_$(GOOS).$O signal_$(GOARCH)_$(GOOS).$O syscall.$O syscall_$(GOARCH)_$(GOOS).$O rm -f $(O1) -a2: $(O2) +a2: $(O2) $(AR) grc syscall.a types_$(GOARCH)_$(GOOS).$O rm -f $(O2) -a3: $(O3) +a3: $(O3) $(AR) grc syscall.a file_$(GOOS).$O socket_$(GOOS).$O time_$(GOARCH)_$(GOOS).$O rm -f $(O3) -a4: $(O4) +a4: $(O4) $(AR) grc syscall.a exec.$O rm -f $(O4) + newpkg: clean $(AR) grc syscall.a @@ -77,6 +83,7 @@ $(O1): newpkg $(O2): a1 $(O3): a2 $(O4): a3 +$(O5): a4 nuke: clean rm -f $(GOROOT)/pkg/syscall.a @@ -85,4 +92,3 @@ packages: syscall.a install: packages cp syscall.a $(GOROOT)/pkg/syscall.a - diff --git a/src/lib/tabwriter/Makefile b/src/lib/tabwriter/Makefile index 7fbdf5546a..0d51ba0335 100644 --- a/src/lib/tabwriter/Makefile +++ b/src/lib/tabwriter/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -34,16 +40,20 @@ coverage: packages O1=\ tabwriter.$O\ -tabwriter.a: a1 -a1: $(O1) +phases: a1 +tabwriter.a: phases + +a1: $(O1) $(AR) grc tabwriter.a tabwriter.$O rm -f $(O1) + newpkg: clean $(AR) grc tabwriter.a $(O1): newpkg +$(O2): a1 nuke: clean rm -f $(GOROOT)/pkg/tabwriter.a @@ -52,4 +62,3 @@ packages: tabwriter.a install: packages cp tabwriter.a $(GOROOT)/pkg/tabwriter.a - diff --git a/src/lib/template/Makefile b/src/lib/template/Makefile index 2634af433b..0a00783993 100644 --- a/src/lib/template/Makefile +++ b/src/lib/template/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -37,21 +43,25 @@ O1=\ O2=\ template.$O\ -template.a: a1 a2 -a1: $(O1) +phases: a1 a2 +template.a: phases + +a1: $(O1) $(AR) grc template.a format.$O rm -f $(O1) -a2: $(O2) +a2: $(O2) $(AR) grc template.a template.$O rm -f $(O2) + newpkg: clean $(AR) grc template.a $(O1): newpkg $(O2): a1 +$(O3): a2 nuke: clean rm -f $(GOROOT)/pkg/template.a @@ -60,4 +70,3 @@ packages: template.a install: packages cp template.a $(GOROOT)/pkg/template.a - diff --git a/src/lib/time/Makefile b/src/lib/time/Makefile index dab4bbfe90..c3c9ebfab1 100644 --- a/src/lib/time/Makefile +++ b/src/lib/time/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -32,8 +38,8 @@ coverage: packages $(AS) $*.s O1=\ - zoneinfo.$O\ sleep.$O\ + zoneinfo.$O\ O2=\ time.$O\ @@ -41,26 +47,30 @@ O2=\ O3=\ tick.$O\ -time.a: a1 a2 a3 -a1: $(O1) - $(AR) grc time.a zoneinfo.$O sleep.$O +phases: a1 a2 a3 +time.a: phases + +a1: $(O1) + $(AR) grc time.a sleep.$O zoneinfo.$O rm -f $(O1) -a2: $(O2) +a2: $(O2) $(AR) grc time.a time.$O rm -f $(O2) -a3: $(O3) +a3: $(O3) $(AR) grc time.a tick.$O rm -f $(O3) + newpkg: clean $(AR) grc time.a $(O1): newpkg $(O2): a1 $(O3): a2 +$(O4): a3 nuke: clean rm -f $(GOROOT)/pkg/time.a @@ -69,4 +79,3 @@ packages: time.a install: packages cp time.a $(GOROOT)/pkg/time.a - diff --git a/src/lib/unicode/Makefile b/src/lib/unicode/Makefile index 1f01631330..98f16e8ed3 100644 --- a/src/lib/unicode/Makefile +++ b/src/lib/unicode/Makefile @@ -4,16 +4,22 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile -O=6 + +O_arm=5 +O_amd64=6 +O_386=8 +OS=568vq + +O=$(O_$(GOARCH)) GC=$(O)g -CC=$(O)c -w +CC=$(O)c -FVw AS=$(O)a -AR=$(O)ar +AR=6ar default: packages clean: - rm -f *.$O *.a $O.out + rm -f *.[$(OS)] *.a [$(OS)].out test: packages gotest @@ -37,21 +43,25 @@ O1=\ O2=\ decimaldigit.$O\ -unicode.a: a1 a2 -a1: $(O1) +phases: a1 a2 +unicode.a: phases + +a1: $(O1) $(AR) grc unicode.a letter.$O rm -f $(O1) -a2: $(O2) +a2: $(O2) $(AR) grc unicode.a decimaldigit.$O rm -f $(O2) + newpkg: clean $(AR) grc unicode.a $(O1): newpkg $(O2): a1 +$(O3): a2 nuke: clean rm -f $(GOROOT)/pkg/unicode.a @@ -60,4 +70,3 @@ packages: unicode.a install: packages cp unicode.a $(GOROOT)/pkg/unicode.a -