diff options
Diffstat (limited to 'src/lib/json')
| -rw-r--r-- | src/lib/json/Makefile | 22 | ||||
| -rw-r--r-- | src/lib/json/generic.go | 4 |
2 files changed, 15 insertions, 11 deletions
diff --git a/src/lib/json/Makefile b/src/lib/json/Makefile index df4157a70..d2dfbb3bc 100644 --- a/src/lib/json/Makefile +++ b/src/lib/json/Makefile @@ -5,13 +5,15 @@ # DO NOT EDIT. Automatically generated by gobuild. # gobuild -m >Makefile +D= + O_arm=5 O_amd64=6 O_386=8 OS=568vq O=$(O_$(GOARCH)) -GC=$(O)g +GC=$(O)g -I_obj CC=$(O)c -FVw AS=$(O)a AR=6ar @@ -19,7 +21,7 @@ AR=6ar default: packages clean: - rm -f *.[$(OS)] *.a [$(OS)].out + rm -rf *.[$(OS)] *.a [$(OS)].out _obj test: packages gotest @@ -46,28 +48,30 @@ O2=\ phases: a1 a2 -json.a: phases +_obj$D/json.a: phases a1: $(O1) - $(AR) grc json.a parse.$O + $(AR) grc _obj$D/json.a parse.$O rm -f $(O1) a2: $(O2) - $(AR) grc json.a generic.$O struct.$O + $(AR) grc _obj$D/json.a generic.$O struct.$O rm -f $(O2) newpkg: clean - $(AR) grc json.a + mkdir -p _obj$D + $(AR) grc _obj$D/json.a $(O1): newpkg $(O2): a1 $(O3): a2 nuke: clean - rm -f $(GOROOT)/pkg/json.a + rm -f $(GOROOT)/pkg$D/json.a -packages: json.a +packages: _obj$D/json.a install: packages - cp json.a $(GOROOT)/pkg/json.a + test -d $(GOROOT)/pkg && mkdir -p $(GOROOT)/pkg$D + cp _obj$D/json.a $(GOROOT)/pkg$D/json.a diff --git a/src/lib/json/generic.go b/src/lib/json/generic.go index 7ce315765..8801f7631 100644 --- a/src/lib/json/generic.go +++ b/src/lib/json/generic.go @@ -7,12 +7,12 @@ package json import ( + "container/vector"; "fmt"; - "math"; "json"; + "math"; "strconv"; "strings"; - "vector"; ) // Integers identifying the data type in the Json interface. |