prettify all json files

Change-Id: Id0ddb42e7418593cf795df3aa528d3f7d75a6565

sys/src/9/386/386.json

@@ -1,17 +1,17 @@
 {
-    "Name":"386",
-    "SourceFiles":[
-	"../386/devether.c",
-	"../386/devrtc.c",
-	"../386/ether8169.c",
-	"../386/ether82557.c",
-	"../386/etherigbe.c",
-	"../386/etherm10g.c",
-	"../386/kbd.c",
-	"../386/pci.c",
-	"../386/random.c",
-	"../386/sdiahci.c",
-	"../386/uarti8250.c",
-	"../386/uartpci.c"
-    ]
+	"Name": "386",
+	"SourceFiles": [
+		"../386/devether.c",
+		"../386/devrtc.c",
+		"../386/ether8169.c",
+		"../386/ether82557.c",
+		"../386/etherigbe.c",
+		"../386/etherm10g.c",
+		"../386/kbd.c",
+		"../386/pci.c",
+		"../386/random.c",
+		"../386/sdiahci.c",
+		"../386/uarti8250.c",
+		"../386/uartpci.c"
+	]
 }

sys/src/9/amd64pv/clean.json

@@ -1,6 +1,6 @@
 {
-    "Name": "clean",
-    "Pre": [
-	"rm -f systab.c k*cpu.c 9* *~ *.o *.root.c *.out errstr.h init.h amd64l.h libboot.a ../boot/*.o boot*.c"
-    ]
+	"Name": "clean",
+	"Pre": [
+		"rm -f systab.c k*cpu.c 9* *~ *.o *.root.c *.out errstr.h init.h amd64l.h libboot.a ../boot/*.o boot*.c"
+	]
 }

sys/src/9/amd64pv/core.json

@@ -1,83 +1,86 @@
 {
-    "Name": "core",
-    "Projects": ["clean.json", "inith.json"],
-    "SourceFiles":[
-	"entry.S",
-	"vsvm.c",
-	"l64v.S",
-	"l64fpu.S",
-	"cpuidamd64.S",
-	"l64acidt.S",
-	"l64idt.S",
-	"l64vsyscall.S",
-	"acore.c",
-	"apic.c",
-	"arch.c",
-	"archk10.c",
-	"asm.c",
-	"backtrace.c",
-	"ctype.c",
-	"devarch.c",
-	"fpu.c",
-	"i8254.c",
-	"i8259.c",
-	"ioapic.c",
-	"main.c",
-	"map.c",
-	"memory.c",
-	"mmu.c",
-	"mp.c",
-	"msi.c",
-	"multiboot.c",
-	"physalloc.c",
-	"pmcio.c",
-	"qmalloc.c",
-	"sipi.c",
-	"syscall.c",
-	"systab.c",
-	"tcore.c",
-	"trap.c"
-    ],
-    "Pre": [
-	"awk -v objtype=amd64 -f ../mk/parse -- -mkdevc $CONF > $CONF.c",
-	"awk -f ../mk/mkenumb amd64.h > amd64l.h",
-	"data2c boot_fs boot.fs >> $CONF.root.c",
-	"awk -f ../mk/parse -- -mksystab /home/rminnich/projects/harvey/sys/src/libc/9syscall/sys.h $CONF > systab.c",
-	"awk -f ../mk/parse -- -mkerrstr $CONF > errstr.h"
-    ],
-    "Cflags": [
-	"-mcmodel=kernel",
-	"-O0",
-	"-static",
-	"-fplan9-extensions",
-	"-ffreestanding",
-	"-fno-builtin",
-	"-DKERNDATE=1433623937",
-	"-g",
-	"-fvar-tracking",
-	"-fvar-tracking-assignments",
-	"-Wall",
-	"-Wno-missing-braces",
-	"-Wno-parentheses",
-	"-Wno-unknown-pragmas",
-	"-Wuninitialized",
-	"-Wmaybe-uninitialized"
-    ],
-    "Libs": [
-	"/amd64/lib/klibc.a",
-	"/amd64/lib/klibip.a",
-	"/amd64/lib/klibdraw.a"
-    ],
-    "Oflags": [
-	"-z",
-	"max-page-size=0x1000",
-	"-nostdlib",
-	"-g",
-	"-T",
-	"kernel.ld"
-    ],
-    "Post": [
-	"objcopy -I elf64-x86-64 -O elf32-i386 9$CONF 9$CONF.32bit",
-	"objdump -S 9$CONF > 9$CONF.asm"
-    ]
+	"Cflags": [
+		"-mcmodel=kernel",
+		"-O0",
+		"-static",
+		"-fplan9-extensions",
+		"-ffreestanding",
+		"-fno-builtin",
+		"-DKERNDATE=1433623937",
+		"-g",
+		"-fvar-tracking",
+		"-fvar-tracking-assignments",
+		"-Wall",
+		"-Wno-missing-braces",
+		"-Wno-parentheses",
+		"-Wno-unknown-pragmas",
+		"-Wuninitialized",
+		"-Wmaybe-uninitialized"
+	],
+	"Libs": [
+		"/amd64/lib/klibc.a",
+		"/amd64/lib/klibip.a",
+		"/amd64/lib/klibdraw.a"
+	],
+	"Name": "core",
+	"Oflags": [
+		"-z",
+		"max-page-size=0x1000",
+		"-nostdlib",
+		"-g",
+		"-T",
+		"kernel.ld"
+	],
+	"Post": [
+		"objcopy -I elf64-x86-64 -O elf32-i386 9$CONF 9$CONF.32bit",
+		"objdump -S 9$CONF \u003e 9$CONF.asm"
+	],
+	"Pre": [
+		"awk -v objtype=amd64 -f ../mk/parse -- -mkdevc $CONF \u003e $CONF.c",
+		"awk -f ../mk/mkenumb amd64.h \u003e amd64l.h",
+		"data2c boot_fs boot.fs \u003e\u003e $CONF.root.c",
+		"awk -f ../mk/parse -- -mksystab /home/rminnich/projects/harvey/sys/src/libc/9syscall/sys.h $CONF \u003e systab.c",
+		"awk -f ../mk/parse -- -mkerrstr $CONF \u003e errstr.h"
+	],
+	"Projects": [
+		"clean.json",
+		"inith.json"
+	],
+	"SourceFiles": [
+		"entry.S",
+		"vsvm.c",
+		"l64v.S",
+		"l64fpu.S",
+		"cpuidamd64.S",
+		"l64acidt.S",
+		"l64idt.S",
+		"l64vsyscall.S",
+		"acore.c",
+		"apic.c",
+		"arch.c",
+		"archk10.c",
+		"asm.c",
+		"backtrace.c",
+		"ctype.c",
+		"devarch.c",
+		"fpu.c",
+		"i8254.c",
+		"i8259.c",
+		"ioapic.c",
+		"main.c",
+		"map.c",
+		"memory.c",
+		"mmu.c",
+		"mp.c",
+		"msi.c",
+		"multiboot.c",
+		"physalloc.c",
+		"pmcio.c",
+		"qmalloc.c",
+		"sipi.c",
+		"syscall.c",
+		"systab.c",
+		"tcore.c",
+		"trap.c"
+	]
 }

sys/src/9/amd64pv/inith.json

@@ -1,32 +1,35 @@
 {
-    "Name": "inith",
-    "SourceFiles": [
-	"init9.c",
-	"../port/initcode.c"
-    ],
-    "Cflags": [
-	"-g","-Wall",
-	"-Wno-missing-braces",
-	"-Wno-parentheses",
-	"-Wno-unknown-pragmas",
-	"-Wuninitialized",
-	"-Wmaybe-uninitialized",
-	"-O0",
-	"-static",
-	"-fplan9-extensions",
-	"-ffreestanding",
-	"-fno-builtin",
-	"-mcmodel=small"
-    ],
-    "Oflags": [
-	"-e_main", "-o", "init", "-static", "-Ttext=0x200020"
-    ],
-    "Post": [
-	"elf2c init > init.h"
-    ],
-    "Libs": [
-	"/amd64/lib/libc.a"
-    ]
-
+	"Cflags": [
+		"-g",
+		"-Wall",
+		"-Wno-missing-braces",
+		"-Wno-parentheses",
+		"-Wno-unknown-pragmas",
+		"-Wuninitialized",
+		"-Wmaybe-uninitialized",
+		"-O0",
+		"-static",
+		"-fplan9-extensions",
+		"-ffreestanding",
+		"-fno-builtin",
+		"-mcmodel=small"
+	],
+	"Libs": [
+		"/amd64/lib/libc.a"
+	],
+	"Name": "inith",
+	"Oflags": [
+		"-e_main",
+		"-o",
+		"init",
+		"-static",
+		"-Ttext=0x200020"
+	],
+	"Post": [
+		"elf2c init \u003e init.h"
+	],
+	"SourceFiles": [
+		"init9.c",
+		"../port/initcode.c"
+	]
 }
-	

sys/src/9/amd64pv/k8cpu.json

@@ -1,74 +1,77 @@
 {
-    "Name":"k8cpu", 
-    "Program": "9k8cpu",
-    "Include":["core.json", "../386/386.json", "../ip/ip.json", "../port/port.json"], 
+	"Env": [
+		"CONF=k8cpu"
+	],
+	"Include": [
+		"core.json",
+		"../386/386.json",
+		"../ip/ip.json",
+		"../port/port.json"
+	],
+	"Name": "k8cpu",
+	"Pre": [
+		"cp ../../../../rc/lib/rcmain rcmain",
+		"data2c _rc_lib_rcmain rcmain \u003e\u003e k8cpu.root.c",
+		"cp ../../cmd/rc/rc.elf.out rc.elf.out",
+		"strip rc.elf.out",
+		"data2c _amd64_bin_rc rc.elf.out \u003e\u003e k8cpu.root.c",
+		"cp ../../cmd/bind.elf.out bind.elf.out",
+		"strip bind.elf.out",
+		"data2c _amd64_bin_bind bind.elf.out\u003e\u003e k8cpu.root.c",
+		"cp ../../cmd/mount.elf.out mount.elf.out",
+		"strip mount.elf.out",
+		"data2c _amd64_bin_mount mount.elf.out\u003e\u003e k8cpu.root.c",
+		"cp ../../cmd/echo.elf.out echo.elf.out",
+		"strip echo.elf.out",
+		"data2c _amd64_bin_echo echo.elf.out\u003e\u003e k8cpu.root.c",
+		"cp ../../cmd/cat.elf.out cat.elf.out",
+		"strip cat.elf.out",
+		"data2c _amd64_bin_cat cat.elf.out\u003e\u003e k8cpu.root.c",
+		"cp ../../cmd/cp.elf.out cp.elf.out",
+		"strip cp.elf.out",
+		"data2c _amd64_bin_cp cp.elf.out\u003e\u003e k8cpu.root.c",
+		"cp ../../cmd/ls.elf.out ls.elf.out",
+		"strip ls.elf.out",
+		"data2c _amd64_bin_ls ls.elf.out\u003e\u003e k8cpu.root.c",
+		"cp ../../cmd/ip/ipconfig/ipconfig.elf.out ipconfig.elf.out",
+		"strip ipconfig.elf.out",
+		"data2c _amd64_bin_ipconfig ipconfig.elf.out\u003e\u003e k8cpu.root.c",
+		"cp ../../cmd/ip/ping.elf.out ping.elf.out",
+		"strip ping.elf.out",
+		"data2c _amd64_bin_ping ping.elf.out\u003e\u003e k8cpu.root.c",
+		"cp ../../cmd/srv.elf.out srv.elf.out",
+		"strip srv.elf.out",
+		"data2c _amd64_bin_srv srv.elf.out\u003e\u003e k8cpu.root.c",
+		"cp ../../cmd/ps.elf.out ps.elf.out",
+		"strip ps.elf.out",
+		"data2c _amd64_bin_ps ps.elf.out\u003e\u003e k8cpu.root.c",
+		"cp ../../cmd/mkdir.elf.out mkdir.elf.out",
+		"strip mkdir.elf.out",
+		"data2c _amd64_bin_mkdir mkdir.elf.out\u003e\u003e k8cpu.root.c",
+		"cp ../../cmd/pwd.elf.out pwd.elf.out",
+		"strip pwd.elf.out",
+		"data2c _amd64_bin_pwd pwd.elf.out\u003e\u003e k8cpu.root.c",
+		"cp ../../cmd/chmod.elf.out chmod.elf.out",
+		"strip chmod.elf.out",
+		"data2c _amd64_bin_chmod chmod.elf.out\u003e\u003e k8cpu.root.c",
+		"cp ../../cmd/date.elf.out date.elf.out",
+		"strip date.elf.out",
+		"data2c _amd64_bin_date date.elf.out\u003e\u003e k8cpu.root.c"
+	],
+	"Program": "9k8cpu",
 	"Projects": [
-	"/sys/src/cmd/rc/kernel.json"
+		"/sys/src/cmd/rc/kernel.json"
 	],
-    "Pre": [
-	"cp ../../../../rc/lib/rcmain rcmain",
-	"data2c _rc_lib_rcmain rcmain >> k8cpu.root.c",
-	"cp ../../cmd/rc/rc.elf.out rc.elf.out",
-	"strip rc.elf.out",
-	"data2c _amd64_bin_rc rc.elf.out >> k8cpu.root.c",
-	"cp ../../cmd/bind.elf.out bind.elf.out",
-	"strip bind.elf.out",
-	"data2c _amd64_bin_bind bind.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/mount.elf.out mount.elf.out",
-	"strip mount.elf.out",
-	"data2c _amd64_bin_mount mount.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/echo.elf.out echo.elf.out",
-	"strip echo.elf.out",
-	"data2c _amd64_bin_echo echo.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/cat.elf.out cat.elf.out",
-	"strip cat.elf.out",
-	"data2c _amd64_bin_cat cat.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/cp.elf.out cp.elf.out",
-	"strip cp.elf.out",
-	"data2c _amd64_bin_cp cp.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/ls.elf.out ls.elf.out",
-	"strip ls.elf.out",
-	"data2c _amd64_bin_ls ls.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/ip/ipconfig/ipconfig.elf.out ipconfig.elf.out",
-	"strip ipconfig.elf.out",
-	"data2c _amd64_bin_ipconfig ipconfig.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/ip/ping.elf.out ping.elf.out",
-	"strip ping.elf.out",
-	"data2c _amd64_bin_ping ping.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/srv.elf.out srv.elf.out",
-	"strip srv.elf.out",
-	"data2c _amd64_bin_srv srv.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/ps.elf.out ps.elf.out",
-	"strip ps.elf.out",
-	"data2c _amd64_bin_ps ps.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/mkdir.elf.out mkdir.elf.out",
-	"strip mkdir.elf.out",
-	"data2c _amd64_bin_mkdir mkdir.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/pwd.elf.out pwd.elf.out",
-	"strip pwd.elf.out",
-	"data2c _amd64_bin_pwd pwd.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/chmod.elf.out chmod.elf.out",
-	"strip chmod.elf.out",
-	"data2c _amd64_bin_chmod chmod.elf.out>> k8cpu.root.c",
-	"cp ../../cmd/date.elf.out date.elf.out",
-	"strip date.elf.out",
-	"data2c _amd64_bin_date date.elf.out>> k8cpu.root.c"
-    ],
-    "SourceFiles":[
-	"cga.c",
-	"devacpi.c",
-	"devusb.c",
-	"ether8139.c",
-	"ether82563.c",
-	"k8cpu.c",
-	"k8cpu.root.c",
-	"usbehcipc.c",
-	"usbohci.c",
-	"usbuhci.c"
-    ],
-    "Env": [
-	"CONF=k8cpu"
-    ]
-
+	"SourceFiles": [
+		"cga.c",
+		"devacpi.c",
+		"devusb.c",
+		"ether8139.c",
+		"ether82563.c",
+		"k8cpu.c",
+		"k8cpu.root.c",
+		"usbehcipc.c",
+		"usbohci.c",
+		"usbuhci.c"
+	]
 }
-

sys/src/9/boot/boot.json

@@ -1,40 +1,37 @@
 {
-    "Name": "Libboot",
+	"Cflags": [
+		"-g",
+		"-Wall",
+		"-Wno-missing-braces",
+		"-Wno-parentheses",
+		"-Wno-unknown-pragmas",
+		"-Wuninitialized",
+		"-Wmaybe-uninitialized",
+		"-O0",
+		"-static",
+		"-fplan9-extensions",
+		"-ffreestanding",
+		"-fno-builtin",
+		"-mcmodel=small"
+	],
 	"Library": "libboot.a",
-    "SourceFiles": [
-	"aux.c",
-	"bootauth.c",
-	"boot.c",
-	"bootcache.c",
-	"bootip.c",
-	"embed.c",
-	"local.c",
-	"paq.c",
-	"sac.c",
-	"settime.c"
-    ],
-    "Cflags": [
-	"-g","-Wall",
-	"-Wno-missing-braces",
-	"-Wno-parentheses",
-	"-Wno-unknown-pragmas",
-	"-Wuninitialized",
-	"-Wmaybe-uninitialized",
-	"-O0",
-	"-static",
-	"-fplan9-extensions",
-	"-ffreestanding",
-	"-fno-builtin",
-	"-mcmodel=small"
-    ],
-    "Oflags": [
-	"-static"
-    ],
-    "Post": [
-	"ar rv libboot.a *.o"
-    ],
-    "Libs": [
-    ]
-
+	"Name": "Libboot",
+	"Oflags": [
+		"-static"
+	],
+	"Post": [
+		"ar rv libboot.a *.o"
+	],
+	"SourceFiles": [
+		"aux.c",
+		"bootauth.c",
+		"boot.c",
+		"bootcache.c",
+		"bootip.c",
+		"embed.c",
+		"local.c",
+		"paq.c",
+		"sac.c",
+		"settime.c"
+	]
 }
-	

sys/src/9/boot/bootconf.json

@@ -1,42 +1,43 @@
 {
-    "Name": "bootk8cpu",
-    "Program": "bootk8cpu.elf.out",
-    "Projects": ["boot.json"],
-	"Pre": [
-	"[ ! -f bootk8cpu.elf.out ] || rm *.elf.out",
-	"awk -f ../mk/parse -- -mkbootconf ../k10/k8cpu > bootk8cpu.c"
+	"Cflags": [
+		"-g",
+		"-Wall",
+		"-Wno-missing-braces",
+		"-Wno-parentheses",
+		"-Wno-unknown-pragmas",
+		"-Wuninitialized",
+		"-Wmaybe-uninitialized",
+		"-O0",
+		"-static",
+		"-fplan9-extensions",
+		"-ffreestanding",
+		"-fno-builtin",
+		"-mcmodel=small"
 	],
-    "SourceFiles": [
-	"printstub.c",
-	"bootk8cpu.c"
-    ],
-    "Cflags": [
-	"-g","-Wall",
-	"-Wno-missing-braces",
-	"-Wno-parentheses",
-	"-Wno-unknown-pragmas",
-	"-Wuninitialized",
-	"-Wmaybe-uninitialized",
-	"-O0",
-	"-static",
-	"-fplan9-extensions",
-	"-ffreestanding",
-	"-fno-builtin",
-	"-mcmodel=small"
+	"Libs": [
+		"libboot.a",
+		"/amd64/lib/libip.a",
+		"/amd64/lib/libauth.a",
+		"/amd64/lib/libc.a"
 	],
+	"Name": "bootk8cpu",
 	"Oflags": [
-	"-e_main",
-	"-static"
+		"-e_main",
+		"-static"
 	],
 	"Post": [
-	"rm *.o *.a"
+		"rm *.o *.a"
 	],
-	"Libs": [
-	"libboot.a",
-	"/amd64/lib/libip.a",
-	"/amd64/lib/libauth.a",
-	"/amd64/lib/libc.a"
+	"Pre": [
+		"[ ! -f bootk8cpu.elf.out ] || rm *.elf.out",
+		"awk -f ../mk/parse -- -mkbootconf ../k10/k8cpu \u003e bootk8cpu.c"
+	],
+	"Program": "bootk8cpu.elf.out",
+	"Projects": [
+		"boot.json"
+	],
+	"SourceFiles": [
+		"printstub.c",
+		"bootk8cpu.c"
 	]
-
 }
-	

sys/src/9/ip/ip.json

@@ -1,28 +1,28 @@
 {
-    "Name":"ip",
-    "SourceFiles":[
-	"../ip/arp.c",
-	"../ip/chandial.c",
-	"../ip/devip.c",
-	"../ip/ethermedium.c",
-	"../ip/gre.c",
-	"../ip/icmp6.c",
-	"../ip/icmp.c",
-	"../ip/inferno.c",
-	"../ip/ipaux.c",
-	"../ip/ip.c",
-	"../ip/ipifc.c",
-	"../ip/ipmux.c",
-	"../ip/iproute.c",
-	"../ip/ipv6.c",
-	"../ip/loopbackmedium.c",
-	"../ip/netdevmedium.c",
-	"../ip/netlog.c",
-	"../ip/nullmedium.c",
-	"../ip/pktmedium.c",
-	"../ip/ptclbsum.c",
-	"../ip/rudp.c",
-	"../ip/tcp.c",
-	"../ip/udp.c"
-    ]
+	"Name": "ip",
+	"SourceFiles": [
+		"../ip/arp.c",
+		"../ip/chandial.c",
+		"../ip/devip.c",
+		"../ip/ethermedium.c",
+		"../ip/gre.c",
+		"../ip/icmp6.c",
+		"../ip/icmp.c",
+		"../ip/inferno.c",
+		"../ip/ipaux.c",
+		"../ip/ip.c",
+		"../ip/ipifc.c",
+		"../ip/ipmux.c",
+		"../ip/iproute.c",
+		"../ip/ipv6.c",
+		"../ip/loopbackmedium.c",
+		"../ip/netdevmedium.c",
+		"../ip/netlog.c",
+		"../ip/nullmedium.c",
+		"../ip/pktmedium.c",
+		"../ip/ptclbsum.c",
+		"../ip/rudp.c",
+		"../ip/tcp.c",
+		"../ip/udp.c"
+	]
 }

sys/src/9/k10/clean.json

@@ -1,6 +1,6 @@
 {
-    "Name": "clean",
-    "Pre": [
-	"rm -f *.o *.root.c *.out errstr.h init.h init amd64l.h ../boot/libboot.a ../boot/*.o boot*.c"
-    ]
+	"Name": "clean",
+	"Pre": [
+		"rm -f *.o *.root.c *.out errstr.h init.h init amd64l.h ../boot/libboot.a ../boot/*.o boot*.c"
+	]
 }

sys/src/9/k10/core.json

@@ -1,85 +1,88 @@
 {
-    "Name": "core",
-    "Projects": ["clean.json", "inith.json"],
-    "SourceFiles":[
-	"entry.S",
-	"vsvm.c",
-	"l64v.S",
-	"l64fpu.S",
-	"cpuidamd64.S",
-	"l64acidt.S",
-	"l64idt.S",
-	"l64vsyscall.S",
-	"acore.c",
-	"apic.c",
-	"arch.c",
-	"archk10.c",
-	"asm.c",
-	"backtrace.c",
-	"ctype.c",
-	"devarch.c",
-	"fpu.c",
-	"i8254.c",
-	"i8259.c",
-	"ioapic.c",
-	"main.c",
-	"map.c",
-	"memory.c",
-	"mmu.c",
-	"mp.c",
-	"msi.c",
-	"multiboot.c",
-	"physalloc.c",
-	"pmcio.c",
-	"qmalloc.c",
-	"sipi.c",
-	"syscall.c",
-	"systab.c",
-	"tcore.c",
-	"trap.c"
-    ],
-    "Pre": [
-	"awk -v objtype=amd64 -f ../mk/parse -- -mkdevc $CONF > $CONF.c",
-	"awk -f ../mk/mkenumb amd64.h > amd64l.h",
-	"strip ../boot/boot${CONF}.elf.out",
-	"data2c boot${CONF}_out ../boot/boot${CONF}.elf.out >> $CONF.root.c",
-	"data2c boot_fs boot.fs >> $CONF.root.c",
-	"awk -f ../mk/parse -- -mksystab ../../libc/9syscall/sys.h $CONF > systab.c",
-	"awk -f ../mk/parse -- -mkerrstr $CONF > errstr.h"
-    ],
-    "Cflags": [
-	"-mcmodel=kernel",
-	"-O0",
-	"-static",
-	"-fplan9-extensions",
-	"-ffreestanding",
-	"-fno-builtin",
-	"-DKERNDATE=1433623937",
-	"-g",
-	"-fvar-tracking",
-	"-fvar-tracking-assignments",
-	"-Wall",
-	"-Wno-missing-braces",
-	"-Wno-parentheses",
-	"-Wno-unknown-pragmas",
-	"-Wuninitialized",
-	"-Wmaybe-uninitialized"
-    ],
-    "Libs": [
-	"/amd64/lib/klibc.a",
-	"/amd64/lib/klibip.a",
-	"/amd64/lib/klibdraw.a"
-    ],
-    "Oflags": [
-	"-z",
-	"max-page-size=0x1000",
-	"-nostdlib",
-	"-g",
-	"-T",
-	"kernel.ld"
-    ],
-    "Post": [
-	"objcopy -I elf64-x86-64 -O elf32-i386 9$CONF 9$CONF.32bit",
-	"objdump -S 9$CONF > 9$CONF.asm"
-    ]
+	"Cflags": [
+		"-mcmodel=kernel",
+		"-O0",
+		"-static",
+		"-fplan9-extensions",
+		"-ffreestanding",
+		"-fno-builtin",
+		"-DKERNDATE=1433623937",
+		"-g",
+		"-fvar-tracking",
+		"-fvar-tracking-assignments",
+		"-Wall",
+		"-Wno-missing-braces",
+		"-Wno-parentheses",
+		"-Wno-unknown-pragmas",
+		"-Wuninitialized",
+		"-Wmaybe-uninitialized"
+	],
+	"Libs": [
+		"/amd64/lib/klibc.a",
+		"/amd64/lib/klibip.a",
+		"/amd64/lib/klibdraw.a"
+	],
+	"Name": "core",
+	"Oflags": [
+		"-z",
+		"max-page-size=0x1000",
+		"-nostdlib",
+		"-g",
+		"-T",
+		"kernel.ld"
+	],
+	"Post": [
+		"objcopy -I elf64-x86-64 -O elf32-i386 9$CONF 9$CONF.32bit",
+		"objdump -S 9$CONF \u003e 9$CONF.asm"
+	],
+	"Pre": [
+		"awk -v objtype=amd64 -f ../mk/parse -- -mkdevc $CONF \u003e $CONF.c",
+		"awk -f ../mk/mkenumb amd64.h \u003e amd64l.h",
+		"strip ../boot/boot${CONF}.elf.out",
+		"data2c boot${CONF}_out ../boot/boot${CONF}.elf.out \u003e\u003e $CONF.root.c",
+		"data2c boot_fs boot.fs \u003e\u003e $CONF.root.c",
+		"awk -f ../mk/parse -- -mksystab ../../libc/9syscall/sys.h $CONF \u003e systab.c",
+		"awk -f ../mk/parse -- -mkerrstr $CONF \u003e errstr.h"
+	],
+	"Projects": [
+		"clean.json",
+		"inith.json"
+	],
+	"SourceFiles": [
+		"entry.S",
+		"vsvm.c",
+		"l64v.S",
+		"l64fpu.S",
+		"cpuidamd64.S",
+		"l64acidt.S",
+		"l64idt.S",
+		"l64vsyscall.S",
+		"acore.c",
+		"apic.c",
+		"arch.c",
+		"archk10.c",
+		"asm.c",
+		"backtrace.c",
+		"ctype.c",
+		"devarch.c",
+		"fpu.c",
+		"i8254.c",
+		"i8259.c",
+		"ioapic.c",
+		"main.c",
+		"map.c",
+		"memory.c",
+		"mmu.c",
+		"mp.c",
+		"msi.c",
+		"multiboot.c",
+		"physalloc.c",
+		"pmcio.c",
+		"qmalloc.c",
+		"sipi.c",
+		"syscall.c",
+		"systab.c",
+		"tcore.c",
+		"trap.c"
+	]
 }

sys/src/9/k10/inith.json

@@ -1,33 +1,34 @@
 {
-    "Name": "inith",
-    "Program": "init",
-    "SourceFiles": [
-	"init9.c",
-	"../port/initcode.c"
-    ],
-    "Cflags": [
-	"-g","-Wall",
-	"-Wno-missing-braces",
-	"-Wno-parentheses",
-	"-Wno-unknown-pragmas",
-	"-Wuninitialized",
-	"-Wmaybe-uninitialized",
-	"-O0",
-	"-static",
-	"-fplan9-extensions",
-	"-ffreestanding",
-	"-fno-builtin",
-	"-mcmodel=small"
-    ],
-    "Oflags": [
-	"-e_main", "-static", "-Ttext=0x200020"
-    ],
-    "Post": [
-	"elf2c init > init.h"
-    ],
-    "Libs": [
-	"/amd64/lib/libc.a"
-    ]
-
+	"Cflags": [
+		"-g",
+		"-Wall",
+		"-Wno-missing-braces",
+		"-Wno-parentheses",
+		"-Wno-unknown-pragmas",
+		"-Wuninitialized",
+		"-Wmaybe-uninitialized",
+		"-O0",
+		"-static",
+		"-fplan9-extensions",
+		"-ffreestanding",
+		"-fno-builtin",
+		"-mcmodel=small"
+	],
+	"Libs": [
+		"/amd64/lib/libc.a"
+	],
+	"Name": "inith",
+	"Oflags": [
+		"-e_main",
+		"-static",
+		"-Ttext=0x200020"
+	],
+	"Post": [
+		"elf2c init \u003e init.h"
+	],
+	"Program": "init",
+	"SourceFiles": [
+		"init9.c",
+		"../port/initcode.c"
+	]
 }
-	

sys/src/9/k10/k8cpu.json

@@ -1,62 +1,65 @@
 {
-    "Name":"k8cpu", 
-    "Program": "9k8cpu",
-    "Include":["core.json", "../386/386.json", "../ip/ip.json", "../port/port.json"], 
+	"Env": [
+		"CONF=k8cpu"
+	],
+	"Include": [
+		"core.json",
+		"../386/386.json",
+		"../ip/ip.json",
+		"../port/port.json"
+	],
+	"Name": "k8cpu",
+	"Post": [
+		"rm *.elf.out"
+	],
+	"Pre": [
+		"data2c _rc_lib_rcmain ../../../../rc/lib/rcmain \u003e\u003e k8cpu.root.c",
+		"cp $HARVEY/amd64/bin/rc rc.elf.out",
+		"strip rc.elf.out",
+		"data2c _amd64_bin_rc rc.elf.out \u003e\u003e k8cpu.root.c",
+		"cp $HARVEY/amd64/bin/bind bind.elf.out",
+		"strip bind.elf.out",
+		"data2c _amd64_bin_bind bind.elf.out\u003e\u003e k8cpu.root.c",
+		"cp $HARVEY/amd64/bin/mount mount.elf.out",
+		"strip mount.elf.out",
+		"data2c _amd64_bin_mount mount.elf.out\u003e\u003e k8cpu.root.c",
+		"cp $HARVEY/amd64/bin/echo echo.elf.out",
+		"strip echo.elf.out",
+		"data2c _amd64_bin_echo echo.elf.out\u003e\u003e k8cpu.root.c",
+		"cp $HARVEY/amd64/bin/ip/ipconfig ipconfig.elf.out",
+		"strip ipconfig.elf.out",
+		"data2c _amd64_bin_ipconfig ipconfig.elf.out\u003e\u003e k8cpu.root.c",
+		"cp $HARVEY/amd64/bin/srv srv.elf.out",
+		"strip srv.elf.out",
+		"data2c _amd64_bin_srv srv.elf.out\u003e\u003e k8cpu.root.c",
+		"cp $HARVEY/amd64/bin/date date.elf.out",
+		"strip date.elf.out",
+		"data2c _amd64_bin_date date.elf.out\u003e\u003e k8cpu.root.c",
+		"cp $HARVEY/amd64/bin/ls ls.elf.out",
+		"strip ls.elf.out",
+		"data2c _amd64_bin_ls ls.elf.out\u003e\u003e k8cpu.root.c",
+		"cp $HARVEY/amd64/bin/cat cat.elf.out",
+		"strip cat.elf.out",
+		"data2c _amd64_bin_cat cat.elf.out\u003e\u003e k8cpu.root.c",
+		"cp $HARVEY/amd64/bin/aux/listen1 listen1.elf.out",
+		"strip listen1.elf.out",
+		"data2c _amd64_bin_aux_listen1 listen1.elf.out\u003e\u003e k8cpu.root.c"
+	],
+	"Program": "9k8cpu",
 	"Projects": [
-	"../boot/bootconf.json",
-	"/sys/src/cmd/kcmds.json"
+		"../boot/bootconf.json",
+		"/sys/src/cmd/kcmds.json"
 	],
-    "Pre": [
-	"data2c _rc_lib_rcmain ../../../../rc/lib/rcmain >> k8cpu.root.c",
-	"cp $HARVEY/amd64/bin/rc rc.elf.out",
-	"strip rc.elf.out",
-	"data2c _amd64_bin_rc rc.elf.out >> k8cpu.root.c",
-	"cp $HARVEY/amd64/bin/bind bind.elf.out",
-	"strip bind.elf.out",
-	"data2c _amd64_bin_bind bind.elf.out>> k8cpu.root.c",
-	"cp $HARVEY/amd64/bin/mount mount.elf.out",
-	"strip mount.elf.out",
-	"data2c _amd64_bin_mount mount.elf.out>> k8cpu.root.c",
-	"cp $HARVEY/amd64/bin/echo echo.elf.out",
-	"strip echo.elf.out",
-	"data2c _amd64_bin_echo echo.elf.out>> k8cpu.root.c",
-	"cp $HARVEY/amd64/bin/ip/ipconfig ipconfig.elf.out",
-	"strip ipconfig.elf.out",
-	"data2c _amd64_bin_ipconfig ipconfig.elf.out>> k8cpu.root.c",
-	"cp $HARVEY/amd64/bin/srv srv.elf.out",
-	"strip srv.elf.out",
-	"data2c _amd64_bin_srv srv.elf.out>> k8cpu.root.c",
-	"cp $HARVEY/amd64/bin/date date.elf.out",
-	"strip date.elf.out",
-	"data2c _amd64_bin_date date.elf.out>> k8cpu.root.c",
-	"cp $HARVEY/amd64/bin/ls ls.elf.out",
-	"strip ls.elf.out",
-	"data2c _amd64_bin_ls ls.elf.out>> k8cpu.root.c",
-	"cp $HARVEY/amd64/bin/cat cat.elf.out",
-	"strip cat.elf.out",
-	"data2c _amd64_bin_cat cat.elf.out>> k8cpu.root.c",
-	"cp $HARVEY/amd64/bin/aux/listen1 listen1.elf.out",
-	"strip listen1.elf.out",
-	"data2c _amd64_bin_aux_listen1 listen1.elf.out>> k8cpu.root.c"
-    ],
-    "SourceFiles":[
-	"cga.c",
-	"devacpi.c",
-	"devusb.c",
-	"ether8139.c",
-	"ether82563.c",
-	"k8cpu.c",
-	"k8cpu.root.c",
-	"usbehcipc.c",
-	"usbohci.c",
-	"usbuhci.c"
-    ],
-    "Post": [
-	"rm *.elf.out"
-    ],
-    "Env": [
-	"CONF=k8cpu"
-    ]
-
+	"SourceFiles": [
+		"cga.c",
+		"devacpi.c",
+		"devusb.c",
+		"ether8139.c",
+		"ether82563.c",
+		"k8cpu.c",
+		"k8cpu.root.c",
+		"usbehcipc.c",
+		"usbohci.c",
+		"usbuhci.c"
+	]
 }
-

sys/src/9/port/port.json

@@ -1,70 +1,69 @@
 {
-    "Name":"port",
-    "SourceFiles":[
-	"../port/alarm.c",
-	"../port/allocb.c",
-	"../port/cache.c",
-	"../port/devcec.c",
-	"../port/chan.c",
-	"../port/cpu_buffer.c",
-	"../port/devaoe.c",
-	"../port/dev.c",
-	"../port/devcons.c",
-	"../port/devdup.c",
-	"../port/devenv.c",
-	"../port/devkexec.c",
-	"../port/devkprof.c",
-	"../port/devmnt.c",
-	"../port/devpci.c",
-	"../port/devpipe.c",
-	"../port/devpmc.c",
-	"../port/devproc.c",
-	"../port/devroot.c",
-	"../port/devsd.c",
-	"../port/devsegment.c",
-	"../port/devsrv.c",
-	"../port/devtab.c",
-	"../port/devtrace.c",
-	"../port/devuart.c",
-	"../port/devwd.c",
-	"../port/devws.c",
-	"../port/devzp.c",
-	"../port/edf.c",
-	"../port/ethermii.c",
-	"../port/fault.c",
-	"../port/hexdump.c",
-	"../port/image.c",
-	"../port/kdebug.c",
-	"../port/kexec.c",
-	"../port/latin1.c",
-	"../port/mul64fract.c",
-	"../port/netif.c",
-	"../port/page.c",
-	"../port/pager.c",
-	"../port/parse.c",
-	"../port/pgrp.c",
-	"../port/portclock.c",
-	"../port/print.c",
-	"../port/proc.c",
-	"../port/ps.c",
-	"../port/qio.c",
-	"../port/qlock.c",
-	"../port/rebootcmd.c",
-	"../port/rmap.c",
-	"../port/sdscsi.c",
-	"../port/segment.c",
-	"../port/sysauth.c",
-	"../port/syscallfmt.c",
-	"../port/sysfile.c",
-	"../port/sysproc.c",
-	"../port/sysseg.c",
-	"../port/syssem.c",
-	"../port/syszio.c",
-	"../port/taslock.c",
-	"../port/tod.c",
-	"../port/usbehci.c",
-	"../port/watermarks.c",
-	"../port/xalloc.c"
-    ]
+	"Name": "port",
+	"SourceFiles": [
+		"../port/alarm.c",
+		"../port/allocb.c",
+		"../port/cache.c",
+		"../port/devcec.c",
+		"../port/chan.c",
+		"../port/cpu_buffer.c",
+		"../port/devaoe.c",
+		"../port/dev.c",
+		"../port/devcons.c",
+		"../port/devdup.c",
+		"../port/devenv.c",
+		"../port/devkexec.c",
+		"../port/devkprof.c",
+		"../port/devmnt.c",
+		"../port/devpci.c",
+		"../port/devpipe.c",
+		"../port/devpmc.c",
+		"../port/devproc.c",
+		"../port/devroot.c",
+		"../port/devsd.c",
+		"../port/devsegment.c",
+		"../port/devsrv.c",
+		"../port/devtab.c",
+		"../port/devtrace.c",
+		"../port/devuart.c",
+		"../port/devwd.c",
+		"../port/devws.c",
+		"../port/devzp.c",
+		"../port/edf.c",
+		"../port/ethermii.c",
+		"../port/fault.c",
+		"../port/hexdump.c",
+		"../port/image.c",
+		"../port/kdebug.c",
+		"../port/kexec.c",
+		"../port/latin1.c",
+		"../port/mul64fract.c",
+		"../port/netif.c",
+		"../port/page.c",
+		"../port/pager.c",
+		"../port/parse.c",
+		"../port/pgrp.c",
+		"../port/portclock.c",
+		"../port/print.c",
+		"../port/proc.c",
+		"../port/ps.c",
+		"../port/qio.c",
+		"../port/qlock.c",
+		"../port/rebootcmd.c",
+		"../port/rmap.c",
+		"../port/sdscsi.c",
+		"../port/segment.c",
+		"../port/sysauth.c",
+		"../port/syscallfmt.c",
+		"../port/sysfile.c",
+		"../port/sysproc.c",
+		"../port/sysseg.c",
+		"../port/syssem.c",
+		"../port/syszio.c",
+		"../port/taslock.c",
+		"../port/tod.c",
+		"../port/usbehci.c",
+		"../port/watermarks.c",
+		"../port/xalloc.c"
+	]
 }
-

sys/src/cmd/9660srv/9660srv.json

@@ -1,17 +1,17 @@
 {
-    "Name": "9660srv",
-    "Program": "9660srv",
-    "Include": ["../cmd.json"],
-    "Pre": [
-	],
-    "SourceFiles": [
-	"9660srv.c",
-	"data.c",
-	"iobuf.c",
-	"main.c",
-	"xfile.c"
+	"Include": [
+		"../cmd.json"
 	],
+	"Name": "9660srv",
 	"Post": [
-	"mv 9660srv $HARVEY/amd64/bin/"
+		"mv 9660srv $HARVEY/amd64/bin/"
+	],
+	"Program": "9660srv",
+	"SourceFiles": [
+		"9660srv.c",
+		"data.c",
+		"iobuf.c",
+		"main.c",
+		"xfile.c"
 	]
 }

sys/src/cmd/9nfs/9nfs.json

@@ -1,32 +1,32 @@
 {
+	"Include": [
+		"../cmd.json"
+	],
 	"Name": "nfsserver",
+	"Post": [
+		"[ -d $HARVEY/amd64/bin/aux ] || mkdir $HARVEY/amd64/bin/aux",
+		"mv nfsserver $HARVEY/amd64/bin/aux/"
+	],
 	"Program": "nfsserver",
 	"Projects": [
-	"portmapper.json",
-	"pcnfsd.json"
-	],
-	"Include": ["../cmd.json"],
-	"Pre": [
+		"portmapper.json",
+		"pcnfsd.json"
 	],
 	"SourceFiles": [
-	"9p.c",
-	"auth.c",
-	"authhostowner.c",
-	"nfs.c",
-	"nfsmount.c",
-	"nfsserver.c",
-	"xfile.c",
-	"chat.c",
-	"rpc.c",
-	"string.c",
-	"strparse.c",
-	"system.c",
-	"listalloc.c",
-	"server.c",
-	"unixnames.c"
-	],
-	"Post": [
-	"[ -d $HARVEY/amd64/bin/aux ] || mkdir $HARVEY/amd64/bin/aux",
-	"mv nfsserver $HARVEY/amd64/bin/aux/"
+		"9p.c",
+		"auth.c",
+		"authhostowner.c",
+		"nfs.c",
+		"nfsmount.c",
+		"nfsserver.c",
+		"xfile.c",
+		"chat.c",
+		"rpc.c",
+		"string.c",
+		"strparse.c",
+		"system.c",
+		"listalloc.c",
+		"server.c",
+		"unixnames.c"
 	]
 }

sys/src/cmd/9nfs/pcnfsd.json

@@ -1,22 +1,22 @@
 {
+	"Include": [
+		"../cmd.json"
+	],
 	"Name": "pcnfsd",
-	"Program": "pcnfsd",
-	"Include": ["../cmd.json"],
-	"Pre": [
+	"Post": [
+		"[ -d $HARVEY/amd64/bin/aux ] || mkdir $HARVEY/amd64/bin/aux",
+		"mv pcnfsd $HARVEY/amd64/bin/aux/"
 	],
+	"Program": "pcnfsd",
 	"SourceFiles": [
-	"pcnfsd.c",
-	"unixnames.c",
-	"chat.c",
-	"rpc.c",
-	"server.c",
-	"string.c",
-	"listalloc.c",
-	"strparse.c",
-	"system.c"
-	],
-	"Post": [
-	"[ -d $HARVEY/amd64/bin/aux ] || mkdir $HARVEY/amd64/bin/aux",
-	"mv pcnfsd $HARVEY/amd64/bin/aux/"
+		"pcnfsd.c",
+		"unixnames.c",
+		"chat.c",
+		"rpc.c",
+		"server.c",
+		"string.c",
+		"listalloc.c",
+		"strparse.c",
+		"system.c"
 	]
 }

sys/src/cmd/9nfs/portmapper.json

@@ -1,18 +1,18 @@
 {
+	"Include": [
+		"../cmd.json"
+	],
 	"Name": "portmapper",
-	"Program": "portmapper",
-	"Include": ["../cmd.json"],
-	"Pre": [
+	"Post": [
+		"[ -d $HARVEY/amd64/bin/aux ] || mkdir $HARVEY/amd64/bin/aux",
+		"mv portmapper $HARVEY/amd64/bin/aux/"
 	],
+	"Program": "portmapper",
 	"SourceFiles": [
-	"portmapper.c",
-	"rpc.c",
-	"chat.c",
-	"server.c",
-	"string.c"
-	],
-	"Post": [
-	"[ -d $HARVEY/amd64/bin/aux ] || mkdir $HARVEY/amd64/bin/aux",
-	"mv portmapper $HARVEY/amd64/bin/aux/"
+		"portmapper.c",
+		"rpc.c",
+		"chat.c",
+		"server.c",
+		"string.c"
 	]
 }

sys/src/cmd/astro/astro.json

@@ -1,42 +1,42 @@
 {
-    "Name": "astro",
-    "Program": "astro",
-    "Include": ["../cmd.json"],
-    "Pre": [
-	],
-    "SourceFiles": [
-	"comet.c",
-	"cosadd.c",
-	"dist.c",
-	"geo.c",
-	"helio.c",
-	"init.c",
-	"jup.c",
-	"main.c",
-	"mars.c",
-	"merc.c",
-	"merct.c",
-	"moon.c",
-	"moont.c",
-	"nept.c",
-	"nutate.c",
-	"nutt.c",
-	"occ.c",
-	"output.c",
-	"pdate.c",
-	"plut.c",
-	"sat.c",
-	"satel.c",
-	"search.c",
-	"star.c",
-	"stars.c",
-	"sun.c",
-	"sunt.c",
-	"uran.c",
-	"venus.c",
-	"venust.c"
+	"Include": [
+		"../cmd.json"
 	],
+	"Name": "astro",
 	"Post": [
-	"mv astro $HARVEY/amd64/bin/"
+		"mv astro $HARVEY/amd64/bin/"
+	],
+	"Program": "astro",
+	"SourceFiles": [
+		"comet.c",
+		"cosadd.c",
+		"dist.c",
+		"geo.c",
+		"helio.c",
+		"init.c",
+		"jup.c",
+		"main.c",
+		"mars.c",
+		"merc.c",
+		"merct.c",
+		"moon.c",
+		"moont.c",
+		"nept.c",
+		"nutate.c",
+		"nutt.c",
+		"occ.c",
+		"output.c",
+		"pdate.c",
+		"plut.c",
+		"sat.c",
+		"satel.c",
+		"search.c",
+		"star.c",
+		"stars.c",
+		"sun.c",
+		"sunt.c",
+		"uran.c",
+		"venus.c",
+		"venust.c"
 	]
 }

sys/src/cmd/auth/auth.json

@@ -1,51 +1,49 @@
 {
-	"Name": "Auth",
-	"Projects": [
-	"factotum/factotum.json",
-	"secstore/secstore.json",
-	"lib/libauthcmd.json",
-	"authsrv.json",
-	"dsa2pub.json",
-	"dsa2ssh.json",
-	"guard.srv.json",
-	"rsa2csr.json",
-	"rsa2pub.json", 
-	"rsa2ssh.json",
-	"rsa2x509.json",
-	"rsafill.json"
-	],
-	"Include": ["../cmd.json"],
-	"Pre": [
-	],
-	"SourceFilesCmd": [
-	"as.c",
-	"asn12dsa.c",
-	"asn12rsa.c",
-	"changeuser.c",
-	"convkeys2.c",
-	"convkeys.c",
-	"cron.c",
-	"debug.c",
-	"dsagen.c",
-	"keyfs.c",
-	"login.c",
-	"netkey.c",
-	"newns.c",
-	"none.c",
-	"passwd.c",
-	"pemdecode.c",
-	"pemencode.c",
-	"printnetkey.c",
-	"readnvram.c",
-	"rsagen.c",
-	"uniq.c",
-	"warning.c",
-	"wrkey.c"
+	"Include": [
+		"../cmd.json"
 	],
+	"Install": "/$ARCH/bin/auth/",
+	"Name": "Auth",
 	"Oflags": [
-	"lib/libauthcmd.a"
+		"lib/libauthcmd.a"
 	],
-	"Post": [
+	"Projects": [
+		"factotum/factotum.json",
+		"secstore/secstore.json",
+		"lib/libauthcmd.json",
+		"authsrv.json",
+		"dsa2pub.json",
+		"dsa2ssh.json",
+		"guard.srv.json",
+		"rsa2csr.json",
+		"rsa2pub.json",
+		"rsa2ssh.json",
+		"rsa2x509.json",
+		"rsafill.json"
 	],
-	"Install": "/$ARCH/bin/auth/"
+	"SourceFilesCmd": [
+		"as.c",
+		"asn12dsa.c",
+		"asn12rsa.c",
+		"changeuser.c",
+		"convkeys2.c",
+		"convkeys.c",
+		"cron.c",
+		"debug.c",
+		"dsagen.c",
+		"keyfs.c",
+		"login.c",
+		"netkey.c",
+		"newns.c",
+		"none.c",
+		"passwd.c",
+		"pemdecode.c",
+		"pemencode.c",
+		"printnetkey.c",
+		"readnvram.c",
+		"rsagen.c",
+		"uniq.c",
+		"warning.c",
+		"wrkey.c"
+	]
 }

sys/src/cmd/auth/authsrv.json

@@ -1,13 +1,15 @@
 {
-    "Name": "authsrv",
-    "Program": "authsrv",
-    "Include": ["../cmd.json"],
-    "SourceFiles": [
-    "authsrv.c",
-    "secureidcheck.c"
+	"Include": [
+		"../cmd.json"
 	],
-    "Oflags": [
-    "lib/libauthcmd.a"
-    ],
-	"Install": "/$ARCH/bin/auth/"
+	"Install": "/$ARCH/bin/auth/",
+	"Name": "authsrv",
+	"Oflags": [
+		"lib/libauthcmd.a"
+	],
+	"Program": "authsrv",
+	"SourceFiles": [
+		"authsrv.c",
+		"secureidcheck.c"
+	]
 }

sys/src/cmd/auth/dsa2pub.json

@@ -1,15 +1,15 @@
 {
-    "Name": "dsa2pub",
-    "Program": "dsa2pub",
-    "Include": ["../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../cmd.json"
 	],
-    "SourceFiles": [
-    "dsa2pub.c",
-    "rsa2any.c"
+	"Install": "/$ARCH/bin/auth/",
+	"Name": "dsa2pub",
+	"Oflags": [
+		"lib/libauthcmd.a"
 	],
-    "Oflags": [
-    "lib/libauthcmd.a"
-    ],
-	"Install": "/$ARCH/bin/auth/"
+	"Program": "dsa2pub",
+	"SourceFiles": [
+		"dsa2pub.c",
+		"rsa2any.c"
+	]
 }

sys/src/cmd/auth/dsa2ssh.json

@@ -1,15 +1,15 @@
 {
-    "Name": "dsa2ssh",
-    "Program": "dsa2ssh",
-    "Include": ["../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../cmd.json"
 	],
-    "SourceFiles": [
-    "dsa2ssh.c",
-    "rsa2any.c"
+	"Install": "/$ARCH/bin/auth/",
+	"Name": "dsa2ssh",
+	"Oflags": [
+		"lib/libauthcmd.a"
 	],
-    "Oflags": [
-    "lib/libauthcmd.a"
-    ],
-	"Install": "/$ARCH/bin/auth/"
+	"Program": "dsa2ssh",
+	"SourceFiles": [
+		"dsa2ssh.c",
+		"rsa2any.c"
+	]
 }

sys/src/cmd/auth/factotum/factotum.json

@@ -1,25 +1,25 @@
 {
-    "Name": "factotum",
-    "Program": "factotum",
-    "Include": ["../../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../../cmd.json"
 	],
-    "SourceFiles": [
-    "apop.c",
-    "chap.c",
-    "confirm.c",
-    "fs.c",
-    "httpdigest.c",
-    "log.c",
-    "p9any.c",
-    "p9cr.c",
-    "p9sk1.c",
-    "pass.c",
-    "rpc.c",
-    "rsa.c",
-    "secstore.c",
-    "util.c",
-    "wep.c"
-	],
-	"Install": "/$ARCH/bin/auth/"
+	"Install": "/$ARCH/bin/auth/",
+	"Name": "factotum",
+	"Program": "factotum",
+	"SourceFiles": [
+		"apop.c",
+		"chap.c",
+		"confirm.c",
+		"fs.c",
+		"httpdigest.c",
+		"log.c",
+		"p9any.c",
+		"p9cr.c",
+		"p9sk1.c",
+		"pass.c",
+		"rpc.c",
+		"rsa.c",
+		"secstore.c",
+		"util.c",
+		"wep.c"
+	]
 }

sys/src/cmd/auth/guard.srv.json

@@ -1,15 +1,15 @@
 {
-    "Name": "guard.srv",
-    "Program": "guard.srv",
-    "Include": ["../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../cmd.json"
 	],
-    "SourceFiles": [
-    "guard.srv.c",
-    "secureidcheck.c"
+	"Install": "/$ARCH/bin/auth/",
+	"Name": "guard.srv",
+	"Oflags": [
+		"lib/libauthcmd.a"
 	],
-    "Oflags": [
-    "lib/libauthcmd.a"
-    ],
-	"Install": "/$ARCH/bin/auth/"
+	"Program": "guard.srv",
+	"SourceFiles": [
+		"guard.srv.c",
+		"secureidcheck.c"
+	]
 }

sys/src/cmd/auth/lib/libauthcmd.json

@@ -1,25 +1,27 @@
 {
-	"Name": "libauthcmd",
-	"Library": "libauthcmd.a",
-	"Include": ["../../../lib.json"],
-    "SourceFiles": [
-	"keyfmt.c",
-	"netcheck.c",
-	"okpasswd.c",
-	"readwrite.c",
-	"readarg.c",
-	"readln.c",
-	"getauthkey.c",
-	"log.c",
-	"error.c",
-	"fs.c",
-	"rdbio.c",
-	"querybio.c",
-	"wrbio.c",
-	"getexpiration.c"
-	],
 	"Cflags": [
-    "-I../"
-    ],
-    "Install": "/sys/src/cmd/auth/lib/"
+		"-I../"
+	],
+	"Include": [
+		"../../../lib.json"
+	],
+	"Install": "/sys/src/cmd/auth/lib/",
+	"Library": "libauthcmd.a",
+	"Name": "libauthcmd",
+	"SourceFiles": [
+		"keyfmt.c",
+		"netcheck.c",
+		"okpasswd.c",
+		"readwrite.c",
+		"readarg.c",
+		"readln.c",
+		"getauthkey.c",
+		"log.c",
+		"error.c",
+		"fs.c",
+		"rdbio.c",
+		"querybio.c",
+		"wrbio.c",
+		"getexpiration.c"
+	]
 }

sys/src/cmd/auth/rsa2csr.json

@@ -1,15 +1,15 @@
 {
-    "Name": "rsa2csr",
-    "Program": "rsa2csr",
-    "Include": ["../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../cmd.json"
 	],
-    "SourceFiles": [
-    "rsa2csr.c",
-    "rsa2any.c"
+	"Install": "/$ARCH/bin/auth/",
+	"Name": "rsa2csr",
+	"Oflags": [
+		"lib/libauthcmd.a"
 	],
-    "Oflags": [
-    "lib/libauthcmd.a"
-    ],
-	"Install": "/$ARCH/bin/auth/"
+	"Program": "rsa2csr",
+	"SourceFiles": [
+		"rsa2csr.c",
+		"rsa2any.c"
+	]
 }

sys/src/cmd/auth/rsa2pub.json

@@ -1,15 +1,15 @@
 {
-    "Name": "rsa2pub",
-    "Program": "rsa2pub",
-    "Include": ["../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../cmd.json"
 	],
-    "SourceFiles": [
-    "rsa2pub.c",
-    "rsa2any.c"
+	"Install": "/$ARCH/bin/auth/",
+	"Name": "rsa2pub",
+	"Oflags": [
+		"lib/libauthcmd.a"
 	],
-    "Oflags": [
-    "lib/libauthcmd.a"
-    ],
-	"Install": "/$ARCH/bin/auth/"
+	"Program": "rsa2pub",
+	"SourceFiles": [
+		"rsa2pub.c",
+		"rsa2any.c"
+	]
 }

sys/src/cmd/auth/rsa2ssh.json

@@ -1,15 +1,15 @@
 {
-    "Name": "rsa2ssh",
-    "Program": "rsa2ssh",
-    "Include": ["../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../cmd.json"
 	],
-    "SourceFiles": [
-    "rsa2ssh.c",
-    "rsa2any.c"
+	"Install": "/$ARCH/bin/auth/",
+	"Name": "rsa2ssh",
+	"Oflags": [
+		"lib/libauthcmd.a"
 	],
-    "Oflags": [
-    "lib/libauthcmd.a"
-    ],
-	"Install": "/$ARCH/bin/auth/"
+	"Program": "rsa2ssh",
+	"SourceFiles": [
+		"rsa2ssh.c",
+		"rsa2any.c"
+	]
 }

sys/src/cmd/auth/rsa2x509.json

@@ -1,15 +1,15 @@
 {
-    "Name": "rsa2x509",
-    "Program": "rsa2x509",
-    "Include": ["../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../cmd.json"
 	],
-    "SourceFiles": [
-    "rsa2x509.c",
-    "rsa2any.c"
+	"Install": "/$ARCH/bin/auth/",
+	"Name": "rsa2x509",
+	"Oflags": [
+		"lib/libauthcmd.a"
 	],
-    "Oflags": [
-    "lib/libauthcmd.a"
-    ],
-	"Install": "/$ARCH/bin/auth/"
+	"Program": "rsa2x509",
+	"SourceFiles": [
+		"rsa2x509.c",
+		"rsa2any.c"
+	]
 }

sys/src/cmd/auth/rsafill.json

@@ -1,15 +1,15 @@
 {
-    "Name": "rsafill",
-    "Program": "rsafill",
-    "Include": ["../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../cmd.json"
 	],
-    "SourceFiles": [
-    "rsafill.c",
-    "rsa2any.c"
+	"Install": "/$ARCH/bin/auth/",
+	"Name": "rsafill",
+	"Oflags": [
+		"lib/libauthcmd.a"
 	],
-    "Oflags": [
-    "lib/libauthcmd.a"
-    ],
-	"Install": "/$ARCH/bin/auth/"
+	"Program": "rsafill",
+	"SourceFiles": [
+		"rsafill.c",
+		"rsa2any.c"
+	]
 }

sys/src/cmd/auth/secstore/aescbc.json

@@ -1,12 +1,12 @@
 {
-    "Name": "aescbc",
-    "Program": "aescbc",
-    "Include": ["../../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../../cmd.json"
 	],
-    "SourceFiles": [
-    "aescbc.c",
-    "util.c"
-	],
-	"Install": "/$ARCH/bin/auth"
+	"Install": "/$ARCH/bin/auth",
+	"Name": "aescbc",
+	"Program": "aescbc",
+	"SourceFiles": [
+		"aescbc.c",
+		"util.c"
+	]
 }

sys/src/cmd/auth/secstore/secstore.json

@@ -1,20 +1,20 @@
 {
-    "Name": "secstore",
-    "Program": "secstore",
-    "Include": ["../../cmd.json"],
-    "Projects": [
-    "aescbc.json",
-    "secstored.json",
-    "secuser.json"
-    ],
-    "Pre": [
+	"Include": [
+		"../../cmd.json"
 	],
-    "SourceFiles": [
-    "pak.c",
-    "password.c",
-    "secstore.c",
-    "SConn.c",
-    "util.c"
+	"Install": "/$ARCH/bin/auth/",
+	"Name": "secstore",
+	"Program": "secstore",
+	"Projects": [
+		"aescbc.json",
+		"secstored.json",
+		"secuser.json"
 	],
-	"Install": "/$ARCH/bin/auth/"
+	"SourceFiles": [
+		"pak.c",
+		"password.c",
+		"secstore.c",
+		"SConn.c",
+		"util.c"
+	]
 }

sys/src/cmd/auth/secstore/secstored.json

@@ -1,17 +1,17 @@
 {
-    "Name": "secstored",
-    "Program": "secstored",
-    "Include": ["../../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../../cmd.json"
 	],
-    "SourceFiles": [
-    "dirls.c",
-    "pak.c",
-    "password.c",
-    "SConn.c",
-    "secstored.c",
-    "../secureidcheck.c",
-    "util.c"
-	],
-	"Install": "/$ARCH/bin/auth/"
+	"Install": "/$ARCH/bin/auth/",
+	"Name": "secstored",
+	"Program": "secstored",
+	"SourceFiles": [
+		"dirls.c",
+		"pak.c",
+		"password.c",
+		"SConn.c",
+		"secstored.c",
+		"../secureidcheck.c",
+		"util.c"
+	]
 }

sys/src/cmd/auth/secstore/secuser.json

@@ -1,15 +1,15 @@
 {
-    "Name": "secuser",
-    "Program": "secuser",
-    "Include": ["../../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../../cmd.json"
 	],
-    "SourceFiles": [
-    "pak.c",
-    "password.c",
-    "SConn.c",
-    "secuser.c",
-    "util.c"
-	],
-	"Install": "/$ARCH/bin/auth/"
+	"Install": "/$ARCH/bin/auth/",
+	"Name": "secuser",
+	"Program": "secuser",
+	"SourceFiles": [
+		"pak.c",
+		"password.c",
+		"SConn.c",
+		"secuser.c",
+		"util.c"
+	]
 }

sys/src/cmd/aux/aux.json

@@ -1,48 +1,50 @@
 {
+	"Include": [
+		"../cmd.json"
+	],
+	"Install": "/$ARCH/bin/aux",
 	"Name": "Aux",
 	"Projects": [
-	"mnihongo/mnihongo.json",
-	"flashfs/flashfs.json",
-	"gps/gps.json",
-	"vga/vga.json"
+		"mnihongo/mnihongo.json",
+		"flashfs/flashfs.json",
+		"gps/gps.json",
+		"vga/vga.json"
 	],
-	"Include": ["../cmd.json"],
 	"SourceFilesCmd": [
-	"9pcon.c",
-	"accupoint.c",
-	"acidleak.c",
-	"apm.c",
-	"astarld.c",
-	"cddb.c",
-	"clog.c",
-	"consolefs.c",
-	"data2s.c",
-	"depend.c",
-	"disksim.c",
-	"getflags.c",
-	"lines.c",
-	"listen.c",
-	"listen1.c",
-	"mklatinkbd.c",
-	"ms2.c",
-	"msexceltables.c",
-	"mswordstrings.c",
-	"mouse.c",
-	"nfsmount.c",
-	"olefs.c",
-	"pcmcia.c",
-	"portmap.c",
-	"rdwr.c",
-	"reboot.c",
-	"searchfs.c",
-	"statusbar.c",
-	"stub.c",
-	"timesync.c",
-	"trampoline.c",
-	"usage.c",
-	"watchdog.c",
-	"write.c",
-	"zerotrunc.c"
-	],
-	"Install": "/$ARCH/bin/aux"
+		"9pcon.c",
+		"accupoint.c",
+		"acidleak.c",
+		"apm.c",
+		"astarld.c",
+		"cddb.c",
+		"clog.c",
+		"consolefs.c",
+		"data2s.c",
+		"depend.c",
+		"disksim.c",
+		"getflags.c",
+		"lines.c",
+		"listen.c",
+		"listen1.c",
+		"mklatinkbd.c",
+		"ms2.c",
+		"msexceltables.c",
+		"mswordstrings.c",
+		"mouse.c",
+		"nfsmount.c",
+		"olefs.c",
+		"pcmcia.c",
+		"portmap.c",
+		"rdwr.c",
+		"reboot.c",
+		"searchfs.c",
+		"statusbar.c",
+		"stub.c",
+		"timesync.c",
+		"trampoline.c",
+		"usage.c",
+		"watchdog.c",
+		"write.c",
+		"zerotrunc.c"
+	]
 }

sys/src/cmd/aux/flashfs/dummyfs.json

@@ -1,16 +1,16 @@
 {
-    "Name": "dummyfs",
-    "Program": "dummyfs",
-    "Include": ["../../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../../cmd.json"
 	],
-    "SourceFiles": [
-    "dummy.c",
-    "dreq.c",
-    "entry.c",
-    "errors.c",
-    "devfs.c",
-    "utils.c"
-	],
-    "Install": "/$ARCH/bin/aux"
+	"Install": "/$ARCH/bin/aux",
+	"Name": "dummyfs",
+	"Program": "dummyfs",
+	"SourceFiles": [
+		"dummy.c",
+		"dreq.c",
+		"entry.c",
+		"errors.c",
+		"devfs.c",
+		"utils.c"
+	]
 }

sys/src/cmd/aux/flashfs/flashfs.json

@@ -1,17 +1,15 @@
 {
-    "Name": "flashfs",
-    "Include": ["../../cmd.json"],
-    "Projects": [
-    "mkflashfs.json",
-    "testldfs.json",
-    "dummyfs.json",
-    "flashfsbin.json"
-    ],
-    "Pre": [
-	],
-    "SourceFiles": [
+	"Include": [
+		"../../cmd.json"
 	],
+	"Name": "flashfs",
 	"Post": [
-    "touch dummy.o"
+		"touch dummy.o"
+	],
+	"Projects": [
+		"mkflashfs.json",
+		"testldfs.json",
+		"dummyfs.json",
+		"flashfsbin.json"
 	]
 }

sys/src/cmd/aux/flashfs/flashfsbin.json

@@ -1,18 +1,18 @@
 {
-    "Name": "flashfsbin",
-    "Program": "flashfs",
-    "Include": ["../../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../../cmd.json"
 	],
-    "SourceFiles": [
-    "flash.c",
-    "journal.c",
-    "entry.c",
-    "errors.c",
-    "request.c",
-    "devfs.c",
-    "conv.c",
-    "utils.c"
-	],
-    "Install": "/$ARCH/bin/aux"
+	"Install": "/$ARCH/bin/aux",
+	"Name": "flashfsbin",
+	"Program": "flashfs",
+	"SourceFiles": [
+		"flash.c",
+		"journal.c",
+		"entry.c",
+		"errors.c",
+		"request.c",
+		"devfs.c",
+		"conv.c",
+		"utils.c"
+	]
 }

sys/src/cmd/aux/flashfs/mkflashfs.json

@@ -1,13 +1,13 @@
 {
-    "Name": "mkflashfs",
-    "Program": "mkflashfs",
-    "Include": ["../../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../../cmd.json"
 	],
-    "SourceFiles": [
-    "mkfs.c",
-    "devfs.c",
-    "utils.c"
-	],
-    "Install": "/$ARCH/bin/aux"
+	"Install": "/$ARCH/bin/aux",
+	"Name": "mkflashfs",
+	"Program": "mkflashfs",
+	"SourceFiles": [
+		"mkfs.c",
+		"devfs.c",
+		"utils.c"
+	]
 }

sys/src/cmd/aux/flashfs/testldfs.json

@@ -1,17 +1,17 @@
 {
-    "Name": "testldfs",
-    "Program": "testldfs",
-    "Include": ["../../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../../cmd.json"
 	],
-    "SourceFiles": [
-    "testld.c",
-    "journal.c",
-    "entry.c",
-    "errors.c",
-    "devfs.c",
-    "conv.c",
-    "utils.c"
-	],
-    "Install": "/$ARCH/bin/aux"
+	"Install": "/$ARCH/bin/aux",
+	"Name": "testldfs",
+	"Program": "testldfs",
+	"SourceFiles": [
+		"testld.c",
+		"journal.c",
+		"entry.c",
+		"errors.c",
+		"devfs.c",
+		"conv.c",
+		"utils.c"
+	]
 }

sys/src/cmd/aux/gps/gps.json

@@ -1,15 +1,15 @@
 {
-    "Name": "gpsfs",
-    "Include": ["../../cmd.json"],
-    "Program": "gpsfs",
-    "Projects": [
-    "gpsevermore.json"
-    ],
-    "Pre": [
+	"Include": [
+		"../../cmd.json"
 	],
-    "SourceFiles": [
-    "util.c",
-    "gpsfs.c"
+	"Install": "/$ARCH/bin/aux",
+	"Name": "gpsfs",
+	"Program": "gpsfs",
+	"Projects": [
+		"gpsevermore.json"
 	],
-    "Install": "/$ARCH/bin/aux"
+	"SourceFiles": [
+		"util.c",
+		"gpsfs.c"
+	]
 }

sys/src/cmd/aux/gps/gpsevermore.json

@@ -1,12 +1,12 @@
 {
-    "Name": "gpsevermore",
-    "Include": ["../../cmd.json"],
-    "Program": "gpsevermore",
-    "Pre": [
+	"Include": [
+		"../../cmd.json"
 	],
-    "SourceFiles": [
-    "util.c",
-    "gpsevermore.c"
-	],
-    "Install": "/$ARCH/bin/aux"
+	"Install": "/$ARCH/bin/aux",
+	"Name": "gpsevermore",
+	"Program": "gpsevermore",
+	"SourceFiles": [
+		"util.c",
+		"gpsevermore.c"
+	]
 }

sys/src/cmd/aux/mnihongo/mnihongo.json

@@ -1,9 +1,11 @@
 {
-    "Name": "mnihongo",
-    "Program": "mnihongo",
-    "Include": ["../../cmd.json"],
-    "SourceFiles": [
-	"mnihongo.c"
+	"Include": [
+		"../../cmd.json"
 	],
-    "Install": "/$ARCH/bin/aux"
+	"Install": "/$ARCH/bin/aux",
+	"Name": "mnihongo",
+	"Program": "mnihongo",
+	"SourceFiles": [
+		"mnihongo.c"
+	]
 }

sys/src/cmd/aux/vga/vga.json

@@ -1,69 +1,69 @@
 {
-    "Name": "vga",
-    "Include": ["../../cmd.json"],
-    "Program": "vga",
-    "Pre": [
+	"Include": [
+		"../../cmd.json"
 	],
-    "SourceFiles": [
-    "3dfx.c",
-    "bt485.c",
-    "ct65540.c",
-    "error.c",
-    "i81x.c",
-    "ics534x.c",
-    "mach64xx.c",
-    "neomagic.c",
-    "radeon.c",
-    "s3928.c",
-    "sc15025.c",
-    "trio64.c",
-    "tvp3026.c",
-    "vga.c",
-    "vision968.c",
-    "ark2000pv.c",
-    "ch9294.c",
-    "cyber938x.c",
-    "et4000.c",
-    "ibm8514.c",
-    "io.c",
-    "main.c",
-    "nvidia.c",
-    "rgb524.c",
-    "s3clock.c",
-    "stg1702.c",
-    "tvp3020.c",
-    "tvp3026clock.c",
-    "virge.c",
-    "vmware.c",
-    "att20c49x.c",
-    "clgd542x.c",
-    "data.c",
-    "et4000hwgc.c",
-    "icd2061a.c",
-    "mach32.c",
-    "mga2164w.c",
-    "palette.c",
-    "rgb524mn.c",
-    "s3generic.c",
-    "t2r4.c",
-    "tvp3025.c",
-    "vesa.c",
-    "vision864.c",
-    "w30c516.c",
-    "att21c498.c",
-    "clgd546x.c",
-    "db.c",
-    "hiqvideo.c",
-    "ics2494.c",
-    "mach64.c",
-    "mga4xx.c",
-    "pci.c",
-    "s3801.c",
-    "s3hwgc.c",
-    "template.c",
-    "tvp3025clock.c",
-    "vesadb.c",
-    "vision964.c"
-	],
-    "Install": "/$ARCH/bin/aux"
+	"Install": "/$ARCH/bin/aux",
+	"Name": "vga",
+	"Program": "vga",
+	"SourceFiles": [
+		"3dfx.c",
+		"bt485.c",
+		"ct65540.c",
+		"error.c",
+		"i81x.c",
+		"ics534x.c",
+		"mach64xx.c",
+		"neomagic.c",
+		"radeon.c",
+		"s3928.c",
+		"sc15025.c",
+		"trio64.c",
+		"tvp3026.c",
+		"vga.c",
+		"vision968.c",
+		"ark2000pv.c",
+		"ch9294.c",
+		"cyber938x.c",
+		"et4000.c",
+		"ibm8514.c",
+		"io.c",
+		"main.c",
+		"nvidia.c",
+		"rgb524.c",
+		"s3clock.c",
+		"stg1702.c",
+		"tvp3020.c",
+		"tvp3026clock.c",
+		"virge.c",
+		"vmware.c",
+		"att20c49x.c",
+		"clgd542x.c",
+		"data.c",
+		"et4000hwgc.c",
+		"icd2061a.c",
+		"mach32.c",
+		"mga2164w.c",
+		"palette.c",
+		"rgb524mn.c",
+		"s3generic.c",
+		"t2r4.c",
+		"tvp3025.c",
+		"vesa.c",
+		"vision864.c",
+		"w30c516.c",
+		"att21c498.c",
+		"clgd546x.c",
+		"db.c",
+		"hiqvideo.c",
+		"ics2494.c",
+		"mach64.c",
+		"mga4xx.c",
+		"pci.c",
+		"s3801.c",
+		"s3hwgc.c",
+		"template.c",
+		"tvp3025clock.c",
+		"vesadb.c",
+		"vision964.c"
+	]
 }

sys/src/cmd/awk/awk.json

@@ -1,29 +1,31 @@
 {
-	"Name": "awk",
-	"Program": "awk",
-	"Include": ["../cmd.json"],
-	"Pre": [
-	"yacc -d awkgram.y",
-	"mv $HARVEY/sys/src/cmd/awk/y.tab.c $HARVEY/sys/src/cmd/awk/awkgram.c"
+	"Cflags": [
+		"-I/sys/include/ape",
+		"-DPLAN9"
 	],
-    "SourceFiles": [
-	"awkgram.c",
-	"lex.c",
-	"lib.c",
-	"main.c",
-	"maketab.c",
-	"parse.c",
-	"proctab.c",
-	"re.c",
-	"run.c",
-	"tran.c"
+	"Include": [
+		"../cmd.json"
 	],
-	"Cflags": [
-	"-I/sys/include/ape",
-    "-DPLAN9"
-    ],
+	"Name": "awk",
 	"Post": [
-	"mv awk $HARVEY/amd64/bin/",
-	"rm awkgram.c"
+		"mv awk $HARVEY/amd64/bin/",
+		"rm awkgram.c"
+	],
+	"Pre": [
+		"yacc -d awkgram.y",
+		"mv $HARVEY/sys/src/cmd/awk/y.tab.c $HARVEY/sys/src/cmd/awk/awkgram.c"
+	],
+	"Program": "awk",
+	"SourceFiles": [
+		"awkgram.c",
+		"lex.c",
+		"lib.c",
+		"main.c",
+		"maketab.c",
+		"parse.c",
+		"proctab.c",
+		"re.c",
+		"run.c",
+		"tran.c"
 	]
 }

sys/src/cmd/bzip2/bzip2.json

@@ -1,24 +1,24 @@
 {
-    "Name": "bzip2",
-    "Include": ["../cmd.json"],
-    "Pre": [
+	"Cflags": [
+		"-DPLAN9"
 	],
-    "Projects": [
-    "lib/libbzip2.json"
-    ],
-    "SourceFilesCmd": [
-    "bunzip2.c",
-    "bzip2.c"
+	"Include": [
+		"../cmd.json"
 	],
-    "Libs": [
-    "lib/libbzip2.a"
-    ],
-    "Cflags": [
-    "-DPLAN9"
-    ],
+	"Libs": [
+		"lib/libbzip2.a"
+	],
+	"Name": "bzip2",
 	"Post": [
-    "mv bunzip2 $HARVEY/amd64/bin/",
-    "mv bzip2 $HARVEY/amd64/bin/",
-    "rm $HARVEY/sys/src/cmd/bzip2/lib/libbzip2.a"
+		"mv bunzip2 $HARVEY/amd64/bin/",
+		"mv bzip2 $HARVEY/amd64/bin/",
+		"rm $HARVEY/sys/src/cmd/bzip2/lib/libbzip2.a"
+	],
+	"Projects": [
+		"lib/libbzip2.json"
+	],
+	"SourceFilesCmd": [
+		"bunzip2.c",
+		"bzip2.c"
 	]
 }

sys/src/cmd/bzip2/lib/libbzip2.json

@@ -1,28 +1,28 @@
 {
-	"Name": "libbzip2",
-	"Library": "libbzip2.a",
-	"Include": ["../../../lib.json"],
-	"Pre": [
+	"Cflags": [
+		"-DPLAN9"
 	],
-    "SourceFiles": [
-	"blocksort.c",
-	"bzassert.c",
-	"bzcompress.c",
-	"bzdecompress.c",
-	"bzfeof.c",
-	"bzlib.c",
-	"bzread.c",
-	"bzversion.c",
-	"bzwrite.c",
-	"bzzlib.c",
-	"compress.c",
-	"crctable.c",
-	"decompress.c",
-	"huffman.c",
-	"randtable.c"
+	"Include": [
+		"../../../lib.json"
 	],
-	"Cflags": [
-    "-DPLAN9"
-    ],
-	"Install": "/sys/src/cmd/bzip2/lib/"
+	"Install": "/sys/src/cmd/bzip2/lib/",
+	"Library": "libbzip2.a",
+	"Name": "libbzip2",
+	"SourceFiles": [
+		"blocksort.c",
+		"bzassert.c",
+		"bzcompress.c",
+		"bzdecompress.c",
+		"bzfeof.c",
+		"bzlib.c",
+		"bzread.c",
+		"bzversion.c",
+		"bzwrite.c",
+		"bzzlib.c",
+		"compress.c",
+		"crctable.c",
+		"decompress.c",
+		"huffman.c",
+		"randtable.c"
+	]
 }

sys/src/cmd/cb/cb.json

@@ -1,14 +1,14 @@
 {
-    "Name": "cb",
-    "Program": "cb",
-    "Include": ["../cmd.json"],
-    "Pre": [
-	],
-    "SourceFiles": [
-	"cb.c",
-	"cbtype.c"
+	"Include": [
+		"../cmd.json"
 	],
+	"Name": "cb",
 	"Post": [
-	"mv cb $HARVEY/amd64/bin/"
+		"mv cb $HARVEY/amd64/bin/"
+	],
+	"Program": "cb",
+	"SourceFiles": [
+		"cb.c",
+		"cbtype.c"
 	]
 }

sys/src/cmd/cdfs/cdfs.json

@@ -1,16 +1,16 @@
 {
-    "Name": "cdfs",
-    "Program": "cdfs",
-    "Include": ["../cmd.json"],
-    "Pre": [
-	],
-    "SourceFiles": [
-	"buf.c",
-	"main.c",
-	"mmc.c",
-	"scsi.c"
+	"Include": [
+		"../cmd.json"
 	],
+	"Name": "cdfs",
 	"Post": [
-	"mv cdfs $HARVEY/amd64/bin/"
+		"mv cdfs $HARVEY/amd64/bin/"
+	],
+	"Program": "cdfs",
+	"SourceFiles": [
+		"buf.c",
+		"main.c",
+		"mmc.c",
+		"scsi.c"
 	]
 }

sys/src/cmd/cifs/cifs.json

@@ -1,29 +1,29 @@
 {
-    "Name": "cifs",
-    "Program": "cifs",
-    "Include": ["../cmd.json"],
-    "Pre": [
-	],
-    "SourceFiles": [
-	"main.c",
-	"transnt.c",
-	"trans2.c",
-	"trans.c",
-	"cifs.c",
-	"netbios.c",
-	"pack.c",
-	"info.c",
-	"fs.c",
-	"sid2name.c",
-	"misc.c",
-	"nterrstr.c",
-	"doserrstr.c",
-	"raperrstr.c",
-	"auth.c",
-	"dfs.c",
-	"ping.c"
+	"Include": [
+		"../cmd.json"
 	],
+	"Name": "cifs",
 	"Post": [
-	"mv cifs $HARVEY/amd64/bin/"
+		"mv cifs $HARVEY/amd64/bin/"
+	],
+	"Program": "cifs",
+	"SourceFiles": [
+		"main.c",
+		"transnt.c",
+		"trans2.c",
+		"trans.c",
+		"cifs.c",
+		"netbios.c",
+		"pack.c",
+		"info.c",
+		"fs.c",
+		"sid2name.c",
+		"misc.c",
+		"nterrstr.c",
+		"doserrstr.c",
+		"raperrstr.c",
+		"auth.c",
+		"dfs.c",
+		"ping.c"
 	]
 }

sys/src/cmd/cmd.json

@@ -1,63 +1,61 @@
 {
-    "Name": "Cmd",
-    "Pre": [
-	"rm -f *.tag.*"
-    ],
-    "Cflags": [
-	"-mcmodel=small",
-	"-O0",
-	"-fplan9-extensions",
-	"-ffreestanding",
-	"-fno-builtin",
-	"-trigraphs",
-	"-Wall",
-	"-Wno-missing-braces",
-	"-Wno-parentheses",
-	"-Wno-unknown-pragmas",
-	"-Wuninitialized",
-	"-Wmaybe-uninitialized",
-	"-g"
-    ],
-    "Oflags": [
-	"-static",
-	"-e_main",
-	"-lavl",
-	"-lbin",
-	"-lcomplete",
-	"-lcontrol",
-	"-ldisk",
-	"-lflate",
-	"-lframe",
-	"-lgeometry",
-	"-lhtml",
-	"-lhttpd",
-	"-lip",
-	"-llex",
-	"-lmemdraw",
-	"-lmemlayer",
-	"-ldraw",
-	"-lplumb",
-	"-lregexp",
-	"-lstdio",
-	"-lString",
-	"-lsunrpc",
-	"-loventi",
-	"-l9p",
-	"-lauth",
-	"-lauthsrv",
-	"-lndb",
-	"-lsec",
-	"-lauth",
-	"-lmp",
-	"-lthread",
-	"-lventi",
-	"-lmach",
-	"-lbio",
-	"-lc"
-    ],
-    "Post": [
-	"rm *.o"
-    ],
-    "Libs": [
-    ]
+	"Cflags": [
+		"-mcmodel=small",
+		"-O0",
+		"-fplan9-extensions",
+		"-ffreestanding",
+		"-fno-builtin",
+		"-trigraphs",
+		"-Wall",
+		"-Wno-missing-braces",
+		"-Wno-parentheses",
+		"-Wno-unknown-pragmas",
+		"-Wuninitialized",
+		"-Wmaybe-uninitialized",
+		"-g"
+	],
+	"Name": "Cmd",
+	"Oflags": [
+		"-static",
+		"-e_main",
+		"-lavl",
+		"-lbin",
+		"-lcomplete",
+		"-lcontrol",
+		"-ldisk",
+		"-lflate",
+		"-lframe",
+		"-lgeometry",
+		"-lhtml",
+		"-lhttpd",
+		"-lip",
+		"-llex",
+		"-lmemdraw",
+		"-lmemlayer",
+		"-ldraw",
+		"-lplumb",
+		"-lregexp",
+		"-lstdio",
+		"-lString",
+		"-lsunrpc",
+		"-loventi",
+		"-l9p",
+		"-lauth",
+		"-lauthsrv",
+		"-lndb",
+		"-lsec",
+		"-lauth",
+		"-lmp",
+		"-lthread",
+		"-lventi",
+		"-lmach",
+		"-lbio",
+		"-lc"
+	],
+	"Post": [
+		"rm *.o"
+	],
+	"Pre": [
+		"rm -f *.tag.*"
+	]
 }

sys/src/cmd/cmds.json

@@ -1,145 +1,147 @@
 {
+	"Include": [
+		"cmd.json"
+	],
+	"Install": "/$ARCH/bin/",
 	"Name": "Cmds",
 	"Projects": [
-	"9660srv/9660srv.json",
-	"9nfs/9nfs.json",
-	"astro/astro.json",
-	"auth/auth.json",
-	"aux/aux.json",
-	"bzip2/bzip2.json",
-	"cb/cb.json",
-	"cdfs/cdfs.json",
-	"cifs/cifs.json",
-	"con/con.json",
-	"dial/dial.json",
-	"diff/diff.json",
-	"disk/disk.json",
-	"dossrv/dossrv.json",
-	"fossil/fossil.json",
-	"ip/ip.json"
+		"9660srv/9660srv.json",
+		"9nfs/9nfs.json",
+		"astro/astro.json",
+		"auth/auth.json",
+		"aux/aux.json",
+		"bzip2/bzip2.json",
+		"cb/cb.json",
+		"cdfs/cdfs.json",
+		"cifs/cifs.json",
+		"con/con.json",
+		"dial/dial.json",
+		"diff/diff.json",
+		"disk/disk.json",
+		"dossrv/dossrv.json",
+		"fossil/fossil.json",
+		"ip/ip.json"
 	],
-	"Include": ["cmd.json"],
 	"SourceFilesCmd": [
-	"aan.c",
-	"archfs.c",
-	"ascii.c",
-	"awd.c",
-	"basename.c",
-	"bsplit.c",
-	"cal.c",
-	"calendar.c",
-	"calls.c",
-	"cat.c",
-	"chgrp.c",
-	"chmod.c",
-	"cleanname.c",
-	"clock.c",
-	"cmp.c",
-	"col.c",
-	"colors.c",
-	"comm.c",
-	"cp.c",
-	"cpu.c",
-	"crop.c",
-	"dc.c",
-	"dd.c",
-	"deroff.c",
-	"du.c",
-	"ecp.c",
-	"ed.c",
-	"factor.c",
-	"fcp.c",
-	"file.c",
-	"fmt.c",
-	"fortune.c",
-	"freq.c",
-	"getmap.c",
-	"gview.c",
-	"hget.c",
-	"histogram.c",
-	"history.c",
-	"html2ms.c",
-	"iconv.c",
-	"idiff.c",
-	"import.c",
-	"init.c",
-	"join.c",
-	"kbmap.c",
-	"kprof.c",
-	"ktrace.c",
-	"lens.c",
-	"lnfs.c",
-	"lock.c",
-	"look.c",
-	"mc.c",
-	"md5sum.c",
-	"mkdir.c",
-	"mntgen.c",
-	"ms2html.c",
-	"mtime.c",
-	"mug.c",
-	"mv.c",
-	"netstat.c",
-	"news.c",
-	"nfs.c",
-	"nm.c",
-	"nntpfs.c",
-	"ns.c",
-	"pbd.c",
-	"p.c",
-	"pcc.c",
-	"pipefile.c",
-	"pr.c",
-	"primes.c",
-	"prof.c",
-	"ps.c",
-	"pump.c",
-	"pwd.c",
-	"ramfs.c",
-	"ratrace.c",
-	"rdbfs.c",
-	"read.c",
-	"resample.c",
-	"rm.c",
-	"rx.c",
-	"screenlock.c",
-	"seconds.c",
-	"sed.c",
-	"seq.c",
-	"sha1sum.c",
-	"size.c",
-	"sleep.c",
-	"sort.c",
-	"split.c",
-	"srvfs.c",
-	"stats.c",
-	"strings.c",
-	"strip.c",
-	"sum.c",
-	"swap.c",
-	"tail.c",
-	"tar.c",
-	"tee.c",
-	"testalarm.c",
-	"test.c",
-	"time.c",
-	"tlsclient.c",
-	"tlssrv.c",
-	"touch.c",
-	"tprof.c",
-	"trace.c",
-	"tr.c",
-	"tweak.c",
-	"unicode.c",
-	"uniq.c",
-	"unlnfs.c",
-	"unmount.c",
-	"wc.c",
-	"webcookies.c",
-	"webfsget.c",
-	"winwatch.c",
-	"xd.c",
-	"yacc.c"
-	],
-	"Install": "/$ARCH/bin/"
+		"aan.c",
+		"archfs.c",
+		"ascii.c",
+		"awd.c",
+		"basename.c",
+		"bsplit.c",
+		"cal.c",
+		"calendar.c",
+		"calls.c",
+		"cat.c",
+		"chgrp.c",
+		"chmod.c",
+		"cleanname.c",
+		"clock.c",
+		"cmp.c",
+		"col.c",
+		"colors.c",
+		"comm.c",
+		"cp.c",
+		"cpu.c",
+		"crop.c",
+		"dc.c",
+		"dd.c",
+		"deroff.c",
+		"du.c",
+		"ecp.c",
+		"ed.c",
+		"factor.c",
+		"fcp.c",
+		"file.c",
+		"fmt.c",
+		"fortune.c",
+		"freq.c",
+		"getmap.c",
+		"gview.c",
+		"hget.c",
+		"histogram.c",
+		"history.c",
+		"html2ms.c",
+		"iconv.c",
+		"idiff.c",
+		"import.c",
+		"init.c",
+		"join.c",
+		"kbmap.c",
+		"kprof.c",
+		"ktrace.c",
+		"lens.c",
+		"lnfs.c",
+		"lock.c",
+		"look.c",
+		"mc.c",
+		"md5sum.c",
+		"mkdir.c",
+		"mntgen.c",
+		"ms2html.c",
+		"mtime.c",
+		"mug.c",
+		"mv.c",
+		"netstat.c",
+		"news.c",
+		"nfs.c",
+		"nm.c",
+		"nntpfs.c",
+		"ns.c",
+		"pbd.c",
+		"p.c",
+		"pcc.c",
+		"pipefile.c",
+		"pr.c",
+		"primes.c",
+		"prof.c",
+		"ps.c",
+		"pump.c",
+		"pwd.c",
+		"ramfs.c",
+		"ratrace.c",
+		"rdbfs.c",
+		"read.c",
+		"resample.c",
+		"rm.c",
+		"rx.c",
+		"screenlock.c",
+		"seconds.c",
+		"sed.c",
+		"seq.c",
+		"sha1sum.c",
+		"size.c",
+		"sleep.c",
+		"sort.c",
+		"split.c",
+		"srvfs.c",
+		"stats.c",
+		"strings.c",
+		"strip.c",
+		"sum.c",
+		"swap.c",
+		"tail.c",
+		"tar.c",
+		"tee.c",
+		"testalarm.c",
+		"test.c",
+		"time.c",
+		"tlsclient.c",
+		"tlssrv.c",
+		"touch.c",
+		"tprof.c",
+		"trace.c",
+		"tr.c",
+		"tweak.c",
+		"unicode.c",
+		"uniq.c",
+		"unlnfs.c",
+		"unmount.c",
+		"wc.c",
+		"webcookies.c",
+		"webfsget.c",
+		"winwatch.c",
+		"xd.c",
+		"yacc.c"
+	]
 }

sys/src/cmd/con/con.json

@@ -1,18 +1,18 @@
 {
-    "Name": "con",
-    "Include": ["../cmd.json"],
-    "Pre": [
-	],
-    "SourceFilesCmd": [
-    "con.c",
-    "xms.c",
-    "xmr.c",
-    "hayes.c"
+	"Include": [
+		"../cmd.json"
 	],
+	"Name": "con",
 	"Post": [
-    "mv con $HARVEY/amd64/bin/",
-    "mv xms $HARVEY/amd64/bin/",
-    "mv xmr $HARVEY/amd64/bin/",
-    "mv hayes $HARVEY/amd64/bin/"
+		"mv con $HARVEY/amd64/bin/",
+		"mv xms $HARVEY/amd64/bin/",
+		"mv xmr $HARVEY/amd64/bin/",
+		"mv hayes $HARVEY/amd64/bin/"
+	],
+	"SourceFilesCmd": [
+		"con.c",
+		"xms.c",
+		"xmr.c",
+		"hayes.c"
 	]
 }

sys/src/cmd/dial/dial.json

@@ -1,18 +1,18 @@
 {
-    "Name": "dial",
-    "Include": ["../cmd.json"],
-    "Pre": [
-	],
-    "SourceFilesCmd": [
-    "at.c",
-    "drain.c",
-    "expect.c",
-    "pass.c"
+	"Include": [
+		"../cmd.json"
 	],
+	"Name": "dial",
 	"Post": [
-    "mv at $HARVEY/amd64/bin/",
-    "mv drain $HARVEY/amd64/bin/",
-    "mv expect $HARVEY/amd64/bin/",
-    "mv pass $HARVEY/amd64/bin/"
+		"mv at $HARVEY/amd64/bin/",
+		"mv drain $HARVEY/amd64/bin/",
+		"mv expect $HARVEY/amd64/bin/",
+		"mv pass $HARVEY/amd64/bin/"
+	],
+	"SourceFilesCmd": [
+		"at.c",
+		"drain.c",
+		"expect.c",
+		"pass.c"
 	]
 }

sys/src/cmd/diff/diff.json

@@ -1,16 +1,16 @@
 {
-    "Name": "diff",
-    "Program": "diff",
-    "Include": ["../cmd.json"],
-    "Pre": [
-	],
-    "SourceFiles": [
-	"diffdir.c",
-	"diffio.c",
-	"diffreg.c",
-	"main.c"
+	"Include": [
+		"../cmd.json"
 	],
+	"Name": "diff",
 	"Post": [
-	"mv diff $HARVEY/amd64/bin/"
+		"mv diff $HARVEY/amd64/bin/"
+	],
+	"Program": "diff",
+	"SourceFiles": [
+		"diffdir.c",
+		"diffio.c",
+		"diffreg.c",
+		"main.c"
 	]
 }

sys/src/cmd/disk/9660/9660.json

@@ -1,27 +1,27 @@
 {
-    "Name": "dump9660",
-    "Program": "dump9660",
-    "Include": ["../../cmd.json"],
-    "Pre": [
-	],
-    "SourceFiles": [
-	"boot.c",
-	"cdrdwr.c",
-	"conform.c",
-	"direc.c",
-	"dump.c",
-	"dump9660.c",
-	"ichar.c",
-	"jchar.c",
-	"path.c",
-	"plan9.c",
-	"rune.c",
-	"sysuse.c",
-	"util.c",
-	"write.c"
+	"Include": [
+		"../../cmd.json"
 	],
+	"Name": "dump9660",
 	"Post": [
-	"mv dump9660 $HARVEY/amd64/bin/",
-	"cp mk9660.rc $HARVEY/amd64/bin/mk9660"
+		"mv dump9660 $HARVEY/amd64/bin/",
+		"cp mk9660.rc $HARVEY/amd64/bin/mk9660"
+	],
+	"Program": "dump9660",
+	"SourceFiles": [
+		"boot.c",
+		"cdrdwr.c",
+		"conform.c",
+		"direc.c",
+		"dump.c",
+		"dump9660.c",
+		"ichar.c",
+		"jchar.c",
+		"path.c",
+		"plan9.c",
+		"rune.c",
+		"sysuse.c",
+		"util.c",
+		"write.c"
 	]
 }

sys/src/cmd/disk/disk.json

@@ -1,25 +1,25 @@
 {
-    "Name": "disk",
-    "Include": ["../cmd.json"],
-    "Pre": [
-	],
-    "Projects": [
-    "9660/9660.json"
-    ],
-    "SourceFilesCmd": [
-    "exsort.c",
-    "format.c",
-    "mbr.c",
-    "mkext.c",
-    "mkfs.c",
-    "partfs.c"
+	"Include": [
+		"../cmd.json"
 	],
+	"Name": "disk",
 	"Post": [
-    "mv exsort $HARVEY/amd64/bin/",
-    "mv format $HARVEY/amd64/bin/",
-    "mv mbr $HARVEY/amd64/bin/",
-    "mv mkext $HARVEY/amd64/bin/",
-    "mv mkfs $HARVEY/amd64/bin/",
-    "mv partfs $HARVEY/amd64/bin/"
+		"mv exsort $HARVEY/amd64/bin/",
+		"mv format $HARVEY/amd64/bin/",
+		"mv mbr $HARVEY/amd64/bin/",
+		"mv mkext $HARVEY/amd64/bin/",
+		"mv mkfs $HARVEY/amd64/bin/",
+		"mv partfs $HARVEY/amd64/bin/"
+	],
+	"Projects": [
+		"9660/9660.json"
+	],
+	"SourceFilesCmd": [
+		"exsort.c",
+		"format.c",
+		"mbr.c",
+		"mkext.c",
+		"mkfs.c",
+		"partfs.c"
 	]
 }

sys/src/cmd/disk/prep/fdisk.json

@@ -1,17 +1,19 @@
 {
-    "Name": "fdisk",
-    "Program": "fdisk",
-    "Include": ["../../cmd.json"],
-    "Pre": [
-    "yacc -d calc.y"
-    ],
-    "SourceFiles": [
-    "fdisk.c",
-    "edit.c",
-    "y.tab.c"
+	"Include": [
+		"../../cmd.json"
 	],
+	"Name": "fdisk",
 	"Post": [
-    "mv fdisk $HARVEY/amd64/bin/",
-    "rm y.tab*"
+		"mv fdisk $HARVEY/amd64/bin/",
+		"rm y.tab*"
+	],
+	"Pre": [
+		"yacc -d calc.y"
+	],
+	"Program": "fdisk",
+	"SourceFiles": [
+		"fdisk.c",
+		"edit.c",
+		"y.tab.c"
 	]
 }

sys/src/cmd/disk/prep/prep.json

@@ -1,18 +1,20 @@
 {
-    "Name": "prep",
-    "Program": "prep",
-    "Include": ["../../cmd.json"],
-    "Pre": [
-    "yacc -d calc.y"
-	],
-    "Projects": [
-    "fdisk.json"
-    ],
-    "SourceFiles": [
-    "prep.c",
-    "edit.c"
+	"Include": [
+		"../../cmd.json"
 	],
+	"Name": "prep",
 	"Post": [
-    "mv prep $HARVEY/amd64/bin/"
+		"mv prep $HARVEY/amd64/bin/"
+	],
+	"Pre": [
+		"yacc -d calc.y"
+	],
+	"Program": "prep",
+	"Projects": [
+		"fdisk.json"
+	],
+	"SourceFiles": [
+		"prep.c",
+		"edit.c"
 	]
 }

sys/src/cmd/dossrv/dossrv.json

@@ -1,20 +1,20 @@
 {
-    "Name": "dossrv",
-    "Program": "dossrv",
-    "Include": ["../cmd.json"],
-    "Pre": [
-	],
-    "SourceFiles": [
-	"xfssrv.c",
-	"xfile.c",
-	"dosfs.c",
-	"dossubs.c",
-	"iotrack.c",
-	"lock.c",
-	"chat.c",
-	"devio.c"
+	"Include": [
+		"../cmd.json"
 	],
+	"Name": "dossrv",
 	"Post": [
-	"mv dossrv $HARVEY/amd64/bin/"
+		"mv dossrv $HARVEY/amd64/bin/"
+	],
+	"Program": "dossrv",
+	"SourceFiles": [
+		"xfssrv.c",
+		"xfile.c",
+		"dosfs.c",
+		"dossubs.c",
+		"iotrack.c",
+		"lock.c",
+		"chat.c",
+		"devio.c"
 	]
 }

sys/src/cmd/fossil/flchk.json

@@ -1,38 +1,38 @@
 {
-    "Name": "flchk",
-    "Program": "flchk",
-    "Include": ["../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../cmd.json"
 	],
-    "SourceFiles": [
-    "9p.c",
-    "9auth.c",
-    "9dir.c",
-    "9excl.c",
-    "9fid.c",
-    "9fsys.c",
-    "9lstn.c",
-    "9proc.c",
-    "9srv.c",
-    "9user.c",
-    "Ccmd.c",
-    "Ccli.c",
-    "Ccons.c",
-    "Clog.c",
-    "archive.c",
-    "nobwatch.c",
-    "cache.c",
-    "check.c",
-    "disk.c",
-    "error.c",
-    "file.c",
-    "flchk.c",
-    "fs.c",
-    "pack.c",
-    "periodic.c",
-    "source.c",
-    "vac.c",
-    "walk.c"
-	],
-	"Install": "/$ARCH/bin/fossil/"
+	"Install": "/$ARCH/bin/fossil/",
+	"Name": "flchk",
+	"Program": "flchk",
+	"SourceFiles": [
+		"9p.c",
+		"9auth.c",
+		"9dir.c",
+		"9excl.c",
+		"9fid.c",
+		"9fsys.c",
+		"9lstn.c",
+		"9proc.c",
+		"9srv.c",
+		"9user.c",
+		"Ccmd.c",
+		"Ccli.c",
+		"Ccons.c",
+		"Clog.c",
+		"archive.c",
+		"nobwatch.c",
+		"cache.c",
+		"check.c",
+		"disk.c",
+		"error.c",
+		"file.c",
+		"flchk.c",
+		"fs.c",
+		"pack.c",
+		"periodic.c",
+		"source.c",
+		"vac.c",
+		"walk.c"
+	]
 }

sys/src/cmd/fossil/flfmt.json

@@ -1,39 +1,39 @@
 {
-    "Name": "flfmt",
-    "Program": "flfmt",
-    "Include": ["../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../cmd.json"
 	],
-    "SourceFiles": [
-    "9p.c",
-    "9auth.c",
-    "9dir.c",
-    "9excl.c",
-    "9fid.c",
-    "9fsys.c",
-    "9lstn.c",
-    "9proc.c",
-    "9srv.c",
-    "9user.c",
-    "Ccmd.c",
-    "Ccli.c",
-    "Ccons.c",
-    "Clog.c",
-    "archive.c",
-    "nobwatch.c",
-    "cache.c",
-    "check.c",
-    "disk.c",
-    "error.c",
-    "file.c",
-    "flfmt9660.c",
-    "flfmt.c",
-    "fs.c",
-    "pack.c",
-    "periodic.c",
-    "source.c",
-    "vac.c",
-    "walk.c"
-	],
-	"Install": "/$ARCH/bin/fossil/"
+	"Install": "/$ARCH/bin/fossil/",
+	"Name": "flfmt",
+	"Program": "flfmt",
+	"SourceFiles": [
+		"9p.c",
+		"9auth.c",
+		"9dir.c",
+		"9excl.c",
+		"9fid.c",
+		"9fsys.c",
+		"9lstn.c",
+		"9proc.c",
+		"9srv.c",
+		"9user.c",
+		"Ccmd.c",
+		"Ccli.c",
+		"Ccons.c",
+		"Clog.c",
+		"archive.c",
+		"nobwatch.c",
+		"cache.c",
+		"check.c",
+		"disk.c",
+		"error.c",
+		"file.c",
+		"flfmt9660.c",
+		"flfmt.c",
+		"fs.c",
+		"pack.c",
+		"periodic.c",
+		"source.c",
+		"vac.c",
+		"walk.c"
+	]
 }

sys/src/cmd/fossil/fossil.json

@@ -1,52 +1,54 @@
 {
-    "Name": "fossil",
-    "Program": "fossil",
-    "Include": ["../cmd.json"],
-    "Pre": [
-    "echo '#!/bin/rc' >> conf",
-    "echo '# THIS FILE IS AUTOMATICALLY GENERATED' >> conf",
-    "echo '# FROM /sys/src/cmd/fossil/conf.rc.  DO NOT EDIT.' >> conf",
-    "echo >> conf",
-    "sed 1d conf.rc >> conf"
-	],
-    "Projects": [
-    "flchk.json",
-    "flfmt.json",
-    "last.json"
-    ],
-    "SourceFiles": [
-    "9p.c",
-    "9auth.c",
-    "9dir.c",
-    "9excl.c",
-    "9fid.c",
-    "9fsys.c",
-    "9lstn.c",
-    "9proc.c",
-    "9srv.c",
-    "9user.c",
-    "Ccmd.c",
-    "Ccli.c",
-    "Ccons.c",
-    "Clog.c",
-    "archive.c",
-    "nobwatch.c",
-    "cache.c",
-    "check.c",
-    "disk.c",
-    "error.c",
-    "file.c",
-    "fossil.c",
-    "fs.c",
-    "pack.c",
-    "periodic.c",
-    "source.c",
-    "vac.c",
-    "walk.c"
+	"Include": [
+		"../cmd.json"
 	],
+	"Install": "/$ARCH/bin/fossil/",
+	"Name": "fossil",
 	"Post": [
-    "chmod +x conf",
-    "mv conf $HARVEY/amd64/bin/fossil/"
+		"chmod +x conf",
+		"mv conf $HARVEY/amd64/bin/fossil/"
+	],
+	"Pre": [
+		"echo '#!/bin/rc' \u003e\u003e conf",
+		"echo '# THIS FILE IS AUTOMATICALLY GENERATED' \u003e\u003e conf",
+		"echo '# FROM /sys/src/cmd/fossil/conf.rc.  DO NOT EDIT.' \u003e\u003e conf",
+		"echo \u003e\u003e conf",
+		"sed 1d conf.rc \u003e\u003e conf"
+	],
+	"Program": "fossil",
+	"Projects": [
+		"flchk.json",
+		"flfmt.json",
+		"last.json"
 	],
-    "Install": "/$ARCH/bin/fossil/"
+	"SourceFiles": [
+		"9p.c",
+		"9auth.c",
+		"9dir.c",
+		"9excl.c",
+		"9fid.c",
+		"9fsys.c",
+		"9lstn.c",
+		"9proc.c",
+		"9srv.c",
+		"9user.c",
+		"Ccmd.c",
+		"Ccli.c",
+		"Ccons.c",
+		"Clog.c",
+		"archive.c",
+		"nobwatch.c",
+		"cache.c",
+		"check.c",
+		"disk.c",
+		"error.c",
+		"file.c",
+		"fossil.c",
+		"fs.c",
+		"pack.c",
+		"periodic.c",
+		"source.c",
+		"vac.c",
+		"walk.c"
+	]
 }

sys/src/cmd/fossil/last.json

@@ -1,38 +1,38 @@
 {
-    "Name": "last",
-    "Program": "last",
-    "Include": ["../cmd.json"],
-    "Pre": [
+	"Include": [
+		"../cmd.json"
 	],
-    "SourceFiles": [
-    "9p.c",
-    "9auth.c",
-    "9dir.c",
-    "9excl.c",
-    "9fid.c",
-    "9fsys.c",
-    "9lstn.c",
-    "9proc.c",
-    "9srv.c",
-    "9user.c",
-    "Ccmd.c",
-    "Ccli.c",
-    "Ccons.c",
-    "Clog.c",
-    "archive.c",
-    "nobwatch.c",
-    "cache.c",
-    "check.c",
-    "disk.c",
-    "error.c",
-    "file.c",
-    "last.c",
-    "fs.c",
-    "pack.c",
-    "periodic.c",
-    "source.c",
-    "vac.c",
-    "walk.c"
-	],
-	"Install": "/$ARCH/bin/fossil/"
+	"Install": "/$ARCH/bin/fossil/",
+	"Name": "last",
+	"Program": "last",
+	"SourceFiles": [
+		"9p.c",
+		"9auth.c",
+		"9dir.c",
+		"9excl.c",
+		"9fid.c",
+		"9fsys.c",
+		"9lstn.c",
+		"9proc.c",
+		"9srv.c",
+		"9user.c",
+		"Ccmd.c",
+		"Ccli.c",
+		"Ccons.c",
+		"Clog.c",
+		"archive.c",
+		"nobwatch.c",
+		"cache.c",
+		"check.c",
+		"disk.c",
+		"error.c",
+		"file.c",
+		"last.c",
+		"fs.c",
+		"pack.c",
+		"periodic.c",
+		"source.c",
+		"vac.c",
+		"walk.c"
+	]
 }

sys/src/cmd/ip/dhcpclient.json

@@ -1,13 +1,13 @@
 {
-    "Name": "dhcpclient",
-    "Program": "dhcpclient",
-    "Include": ["../kernel.json"],
-    "Pre": [
-	],
-    "SourceFiles": [
-	"dhcpclient.c"
+	"Include": [
+		"../kernel.json"
 	],
+	"Name": "dhcpclient",
 	"Post": [
-	"mv dhcpclient $HARVEY/amd64/bin/ip/"
+		"mv dhcpclient $HARVEY/amd64/bin/ip/"
+	],
+	"Program": "dhcpclient",
+	"SourceFiles": [
+		"dhcpclient.c"
 	]
 }

sys/src/cmd/ip/ip.json

@@ -1,9 +1,11 @@
 {
+	"Include": [
+		"/sys/src/cmd/cmd.json"
+	],
+	"Install": "/$ARCH/bin/ip",
 	"Name": "ipcmds",
-	"Include": ["/sys/src/cmd/cmd.json"],
 	"SourceFilesCmd": [
-	"ping.c",
-	"dhcpclient.c"
-	],
-	"Install": "/$ARCH/bin/ip"
+		"ping.c",
+		"dhcpclient.c"
+	]
 }

sys/src/cmd/ip/ipconfig/ipconfig.json

@@ -1,16 +1,16 @@
 {
-    "Name": "ipconfig",
-    "Program": "ipconfig",
-    "Include": ["../../kernel.json"],
-    "Pre": [
-	],
-    "SourceFiles": [
-	"ipv6.c",
-	"main.c",
-	"ppp.c"
+	"Include": [
+		"../../kernel.json"
 	],
+	"Name": "ipconfig",
 	"Post": [
-	"[ -d $HARVEY/amd64/bin/ip ] || mkdir $HARVEY/amd64/bin/ip",
-	"mv ipconfig $HARVEY/amd64/bin/ip/ipconfig"
+		"[ -d $HARVEY/amd64/bin/ip ] || mkdir $HARVEY/amd64/bin/ip",
+		"mv ipconfig $HARVEY/amd64/bin/ip/ipconfig"
+	],
+	"Program": "ipconfig",
+	"SourceFiles": [
+		"ipv6.c",
+		"main.c",
+		"ppp.c"
 	]
 }

sys/src/cmd/kcmds.json

@@ -1,28 +1,28 @@
 {
+	"Include": [
+		"kernel.json"
+	],
 	"Name": "Kcmds",
-	"Projects": [
-	"/sys/src/cmd/rc/rc.json",
-	"/sys/src/cmd/ip/ipconfig/ipconfig.json",
-	"/sys/src/cmd/ip/dhcpclient.json"
+	"Post": [
+		"[ -d $HARVEY/amd64/bin ] || mkdir $HARVEY/amd64/bin",
+		"mv bind $HARVEY/amd64/bin/",
+		"mv mount $HARVEY/amd64/bin/",
+		"mv date $HARVEY/amd64/bin/",
+		"mv srv $HARVEY/amd64/bin/",
+		"mv echo $HARVEY/amd64/bin/",
+		"mv ls $HARVEY/amd64/bin/"
 	],
-	"Include": ["kernel.json"],
-	"Pre": [
+	"Projects": [
+		"/sys/src/cmd/rc/rc.json",
+		"/sys/src/cmd/ip/ipconfig/ipconfig.json",
+		"/sys/src/cmd/ip/dhcpclient.json"
 	],
 	"SourceFilesCmd": [
-	"bind.c",
-	"mount.c",
-	"date.c",
-	"srv.c",
-	"echo.c",
-	"ls.c"
-	],
-	"Post": [
-	"[ -d $HARVEY/amd64/bin ] || mkdir $HARVEY/amd64/bin",
-	"mv bind $HARVEY/amd64/bin/",
-	"mv mount $HARVEY/amd64/bin/",
-	"mv date $HARVEY/amd64/bin/",
-	"mv srv $HARVEY/amd64/bin/",
-	"mv echo $HARVEY/amd64/bin/",
-	"mv ls $HARVEY/amd64/bin/"
+		"bind.c",
+		"mount.c",
+		"date.c",
+		"srv.c",
+		"echo.c",
+		"ls.c"
 	]
 }

sys/src/cmd/kernel.json

@@ -1,36 +1,36 @@
 {
-    "Name": "KernelCmd",
-    "Pre": [
-	"rm -f *.o *.tag.*"
-    ],
-    "Cflags": [
-	"-mcmodel=small",
-	"-O0",
-	"-fplan9-extensions",
-	"-ffreestanding",
-	"-fno-builtin",
-	"-Wall",
-	"-Wno-missing-braces",
-	"-Wno-parentheses",
-	"-Wno-unknown-pragmas",
-	"-Wuninitialized",
-	"-Wmaybe-uninitialized",
-	"-g"
-    ],
-    "Oflags": [
-	"-static",
-	"-e_main"
-    ],
-    "Post": [
-	"rm *.o"
-    ],
-    "Libs": [
-	"/amd64/lib/libString.a",
-	"/amd64/lib/lib9p.a",
-	"/amd64/lib/libndb.a",
-	"/amd64/lib/libauth.a",
-	"/amd64/lib/libbio.a",
-	"/amd64/lib/libip.a",
-	"/amd64/lib/libc.a"
-    ]
+	"Cflags": [
+		"-mcmodel=small",
+		"-O0",
+		"-fplan9-extensions",
+		"-ffreestanding",
+		"-fno-builtin",
+		"-Wall",
+		"-Wno-missing-braces",
+		"-Wno-parentheses",
+		"-Wno-unknown-pragmas",
+		"-Wuninitialized",
+		"-Wmaybe-uninitialized",
+		"-g"
+	],
+	"Libs": [
+		"/amd64/lib/libString.a",
+		"/amd64/lib/lib9p.a",
+		"/amd64/lib/libndb.a",
+		"/amd64/lib/libauth.a",
+		"/amd64/lib/libbio.a",
+		"/amd64/lib/libip.a",
+		"/amd64/lib/libc.a"
+	],
+	"Name": "KernelCmd",
+	"Oflags": [
+		"-static",
+		"-e_main"
+	],
+	"Post": [
+		"rm *.o"
+	],
+	"Pre": [
+		"rm -f *.o *.tag.*"
+	]
 }

sys/src/cmd/rc/rc.json

@@ -1,32 +1,34 @@
 {
-    "Name": "rc",
-    "Program": "rc",
-    "Include": ["../kernel.json"],
-    "Pre": [
-	"yacc -d syn.y",
-	"cp y.tab.h x.tab.h"
+	"Include": [
+		"../kernel.json"
 	],
-    "SourceFiles": [
-	"code.c",
-	"exec.c",
-	"getflags.c",
-	"glob.c",
-	"havefork.c",
-	"here.c",
-	"io.c",
-	"lex.c",
-	"pcmd.c",
-	"pfnc.c",
-	"plan9.c",
-	"simple.c",
-	"subr.c",
-	"trap.c",
-	"tree.c",
-	"var.c",
-	"y.tab.c"
+	"Name": "rc",
+	"Post": [
+		"mv rc $HARVEY/amd64/bin/",
+		"rm y.tab* x.tab*"
 	],
-	"Post":[
-	"mv rc $HARVEY/amd64/bin/",
-	"rm y.tab* x.tab*"
+	"Pre": [
+		"yacc -d syn.y",
+		"cp y.tab.h x.tab.h"
+	],
+	"Program": "rc",
+	"SourceFiles": [
+		"code.c",
+		"exec.c",
+		"getflags.c",
+		"glob.c",
+		"havefork.c",
+		"here.c",
+		"io.c",
+		"lex.c",
+		"pcmd.c",
+		"pfnc.c",
+		"plan9.c",
+		"simple.c",
+		"subr.c",
+		"trap.c",
+		"tree.c",
+		"var.c",
+		"y.tab.c"
 	]
 }

sys/src/klib.json

@@ -1,28 +1,26 @@
 {
-    "Name": "KernelLibs",
-    "Pre": [
-	"rm -f *.o *.tag.*"
-    ],
-    "Cflags": [
-	"-mcmodel=kernel",
-	"-O0",
-	"-fplan9-extensions",
-	"-ffreestanding",
-	"-fno-builtin",
-	"-Wall",
-	"-Wno-missing-braces",
-	"-Wno-parentheses",
-	"-Wno-unknown-pragmas",
-	"-Wuninitialized",
-	"-Wmaybe-uninitialized",
-	"-g"
-    ],
-    "Oflags": [
-	"-static"
-    ],
+	"Cflags": [
+		"-mcmodel=kernel",
+		"-O0",
+		"-fplan9-extensions",
+		"-ffreestanding",
+		"-fno-builtin",
+		"-Wall",
+		"-Wno-missing-braces",
+		"-Wno-parentheses",
+		"-Wno-unknown-pragmas",
+		"-Wuninitialized",
+		"-Wmaybe-uninitialized",
+		"-g"
+	],
+	"Name": "KernelLibs",
+	"Oflags": [
+		"-static"
+	],
 	"Post": [
-	"rm *.o"
-    ],
-    "Libs": [
-    ]
+		"rm *.o"
+	],
+	"Pre": [
+		"rm -f *.o *.tag.*"
+	]
 }

sys/src/klibs.json

@@ -1,9 +1,8 @@
 {
-	"Name":"klibs",
-	"Include":[], 
+	"Name": "klibs",
 	"Projects": [
-	"/sys/src/libc/klibc.json",
-	"/sys/src/libip/klibip.json",
-	"/sys/src/libdraw/klibdraw.json"
+		"/sys/src/libc/klibc.json",
+		"/sys/src/libip/klibip.json",
+		"/sys/src/libdraw/klibdraw.json"
 	]
-}
+}

sys/src/lib.json

@@ -1,29 +1,27 @@
 {
-    "Name": "Libs",
-    "Pre": [
-    "mkdir -p $HARVEY/amd64/bin",
-	"mkdir -p $HARVEY/amd64/lib",
-	"rm -f *.o *.tag.*"
-    ],
-    "Cflags": [
-	"-O0",
-	"-fplan9-extensions",
-	"-ffreestanding",
-	"-fno-builtin",
-	"-Wall",
-	"-Wno-missing-braces",
-	"-Wno-parentheses",
-	"-Wno-unknown-pragmas",
-	"-Wuninitialized",
-	"-Wmaybe-uninitialized",
-	"-g"
-    ],
-    "Oflags": [
-	"-static"
-    ],
+	"Cflags": [
+		"-O0",
+		"-fplan9-extensions",
+		"-ffreestanding",
+		"-fno-builtin",
+		"-Wall",
+		"-Wno-missing-braces",
+		"-Wno-parentheses",
+		"-Wno-unknown-pragmas",
+		"-Wuninitialized",
+		"-Wmaybe-uninitialized",
+		"-g"
+	],
+	"Name": "Libs",
+	"Oflags": [
+		"-static"
+	],
 	"Post": [
-	"rm *.o"
-    ],
-    "Libs": [
-    ]
+		"rm *.o"
+	],
+	"Pre": [
+		"mkdir -p $HARVEY/amd64/bin",
+		"mkdir -p $HARVEY/amd64/lib",
+		"rm -f *.o *.tag.*"
+	]
 }

sys/src/lib9p/lib9p.json

@@ -1,25 +1,25 @@
 {
-	"Name": "lib9p",
-	"Library": "lib9p.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"auth.c",
-	"dirread.c",
-	"fid.c",
-	"file.c",
-	"intmap.c",
-	"listen.c",
-	"mem.c",
-	"req.c",
-	"parse.c",
-	"post.c",
-	"rfork.c",
-	"srv.c",
-	"thread.c",
-	"uid.c",
-	"util.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "lib9p.a",
+	"Name": "lib9p",
+	"SourceFiles": [
+		"auth.c",
+		"dirread.c",
+		"fid.c",
+		"file.c",
+		"intmap.c",
+		"listen.c",
+		"mem.c",
+		"req.c",
+		"parse.c",
+		"post.c",
+		"rfork.c",
+		"srv.c",
+		"thread.c",
+		"uid.c",
+		"util.c"
+	]
 }

sys/src/libString/libString.json

@@ -1,27 +1,27 @@
 {
-	"Name": "libString",
-	"Library": "libString.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"s_alloc.c",
-	"s_append.c",
-	"s_array.c",
-	"s_copy.c",
-	"s_getline.c",
-	"s_grow.c",
-	"s_memappend.c",
-	"s_nappend.c",
-	"s_parse.c",
-	"s_putc.c",
-	"s_rdinstack.c",
-	"s_read.c",
-	"s_read_line.c",
-	"s_reset.c",
-	"s_terminate.c",
-	"s_tolower.c",
-	"s_unique.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libString.a",
+	"Name": "libString",
+	"SourceFiles": [
+		"s_alloc.c",
+		"s_append.c",
+		"s_array.c",
+		"s_copy.c",
+		"s_getline.c",
+		"s_grow.c",
+		"s_memappend.c",
+		"s_nappend.c",
+		"s_parse.c",
+		"s_putc.c",
+		"s_rdinstack.c",
+		"s_read.c",
+		"s_read_line.c",
+		"s_reset.c",
+		"s_terminate.c",
+		"s_tolower.c",
+		"s_unique.c"
+	]
 }

sys/src/libauth/libauth.json

@@ -1,26 +1,26 @@
 {
-	"Name": "libauth",
-	"Library": "libauth.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"amount.c",
-	"amount_getkey.c",
-	"attr.c",
-	"auth_attr.c",
-	"auth_challenge.c",
-	"auth_chuid.c",
-	"auth_getkey.c",
-	"auth_getuserpasswd.c",
-	"auth_proxy.c",
-	"auth_respond.c",
-	"auth_rpc.c",
-	"auth_userpasswd.c",
-	"auth_wep.c",
-	"login.c",
-	"newns.c",
-	"noworld.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libauth.a",
+	"Name": "libauth",
+	"SourceFiles": [
+		"amount.c",
+		"amount_getkey.c",
+		"attr.c",
+		"auth_attr.c",
+		"auth_challenge.c",
+		"auth_chuid.c",
+		"auth_getkey.c",
+		"auth_getuserpasswd.c",
+		"auth_proxy.c",
+		"auth_respond.c",
+		"auth_rpc.c",
+		"auth_userpasswd.c",
+		"auth_wep.c",
+		"login.c",
+		"newns.c",
+		"noworld.c"
+	]
 }

sys/src/libauthsrv/libauthsrv.json

@@ -1,25 +1,25 @@
 {
-	"Name": "libauthsrv",
-	"Library": "libauthsrv.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"_asgetticket.c",
-	"_asrdresp.c",
-	"authdial.c",
-	"convA2M.c",
-	"convM2A.c",
-	"convM2PR.c",
-	"convM2T.c",
-	"convM2TR.c",
-	"convPR2M.c",
-	"convT2M.c",
-	"convTR2M.c",
-	"nvcsum.c",
-	"opasstokey.c",
-	"passtokey.c",
-	"readnvram.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libauthsrv.a",
+	"Name": "libauthsrv",
+	"SourceFiles": [
+		"_asgetticket.c",
+		"_asrdresp.c",
+		"authdial.c",
+		"convA2M.c",
+		"convM2A.c",
+		"convM2PR.c",
+		"convM2T.c",
+		"convM2TR.c",
+		"convPR2M.c",
+		"convT2M.c",
+		"convTR2M.c",
+		"nvcsum.c",
+		"opasstokey.c",
+		"passtokey.c",
+		"readnvram.c"
+	]
 }

sys/src/libavl/libavl.json

@@ -1,11 +1,11 @@
 {
-	"Name": "libavl",
-	"Library": "libavl.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"avl.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libavl.a",
+	"Name": "libavl",
+	"SourceFiles": [
+		"avl.c"
+	]
 }

sys/src/libbin/libbin.json

@@ -1,11 +1,11 @@
 {
-	"Name": "libbin",
-	"Library": "libbin.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"bin.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libbin.a",
+	"Name": "libbin",
+	"SourceFiles": [
+		"bin.c"
+	]
 }

sys/src/libbio/libbio.json

@@ -1,27 +1,27 @@
 {
-	"Name": "libbio",
-	"Library": "libbio.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"bbuffered.c",
-	"bfildes.c",
-	"bflush.c",
-	"bgetrune.c",
-	"bgetc.c",
-	"bgetd.c",
-	"binit.c",
-	"boffset.c",
-	"bprint.c",
-	"bputrune.c",
-	"bputc.c",
-	"brdline.c",
-	"brdstr.c",
-	"bread.c",
-	"bseek.c",
-	"bwrite.c",
-	"bvprint.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libbio.a",
+	"Name": "libbio",
+	"SourceFiles": [
+		"bbuffered.c",
+		"bfildes.c",
+		"bflush.c",
+		"bgetrune.c",
+		"bgetc.c",
+		"bgetd.c",
+		"binit.c",
+		"boffset.c",
+		"bprint.c",
+		"bputrune.c",
+		"bputc.c",
+		"brdline.c",
+		"brdstr.c",
+		"bread.c",
+		"bseek.c",
+		"bwrite.c",
+		"bvprint.c"
+	]
 }

sys/src/libc/9syscall/9syscall.json

@@ -1,9 +1,7 @@
 {
-	"Name": "KernelLibc",
 	"Library": "klibc.a",
-	"Include": [],
+	"Name": "KernelLibc",
 	"Pre": [
-	"../../../../util/mksys amd64"
+		"../../../../util/mksys amd64"
 	]
-
-}
+}

sys/src/libc/klibc.json

@@ -1,274 +1,274 @@
 {
-	"Name": "KernelLibc",
-	"Library": "klibc.a",
-	"Include": ["../klib.json"],
-	"Projects": [
-	"9syscall/9syscall.json"
-	],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"9sys/abort.c",
-	"9sys/access.c",
-	"9sys/announce.c",
-	"9sys/convD2M.c",
-	"9sys/convM2D.c",
-	"9sys/convM2S.c",
-	"9sys/convS2M.c",
-	"9sys/cputime.c",
-	"9sys/ctime.c",
-	"9sys/dial.c",
-	"9sys/dirfstat.c",
-	"9sys/dirfwstat.c",
-	"9sys/dirmodefmt.c",
-	"9sys/dirread.c",
-	"9sys/dirstat.c",
-	"9sys/dirwstat.c",
-	"9sys/fcallfmt.c",
-	"9sys/fork.c",
-	"9sys/getnetconninfo.c",
-	"9sys/getenv.c",
-	"9sys/getpid.c",
-	"9sys/getppid.c",
-	"9sys/getwd.c",
-	"9sys/iounit.c",
-	"9sys/nulldir.c",
-	"9sys/postnote.c",
-	"9sys/privalloc.c",
-	"9sys/pushssl.c",
-	"9sys/pushtls.c",
-	"9sys/putenv.c",
-	"9sys/qlock.c",
-	"9sys/read.c",
-	"9sys/read9pmsg.c",
-	"9sys/readv.c",
-	"9sys/rerrstr.c",
-	"9sys/sbrk.c",
-	"9sys/setnetmtpt.c",
-	"9sys/sysfatal.c",
-	"9sys/syslog.c",
-	"9sys/sysname.c",
-	"9sys/time.c",
-	"9sys/times.c",
-	"9sys/tm2sec.c",
-	"9sys/truerand.c",
-	"9sys/wait.c",
-	"9sys/waitpid.c",
-	"9sys/werrstr.c",
-	"9sys/write.c",
-	"9sys/writev.c",
-	"9syscall/alarm.s",
-	"9syscall/await.s",
-	"9syscall/bind.s",
-	"9syscall/brk_.s",
-	"9syscall/chdir.s",
-	"9syscall/close.s",
-	"9syscall/create.s",
-	"9syscall/dup.s",
-	"9syscall/_errstr.s",
-	"9syscall/errstr.s",
-	"9syscall/execac.s",
-	"9syscall/exec.s",
-	"9syscall/_exits.s",
-	"9syscall/fauth.s",
-	"9syscall/fd2path.s",
-	"9syscall/_fsession.s",
-	"9syscall/_fstat.s",
-	"9syscall/fstat.s",
-	"9syscall/fversion.s",
-	"9syscall/_fwstat.s",
-	"9syscall/fwstat.s",
-	"9syscall/_mount.s",
-	"9syscall/mount.s",
-	"9syscall/nixsyscall.s",
-	"9syscall/noted.s",
-	"9syscall/notify.s",
-	"9syscall/nsec.s",
-	"9syscall/open.s",
-	"9syscall/oseek.s",
-	"9syscall/pipe.s",
-	"9syscall/pread.s",
-	"9syscall/pwrite.s",
-	"9syscall/_read.s",
-	"9syscall/remove.s",
-	"9syscall/rendezvous.s",
-	"9syscall/rfork.s",
-	"9syscall/seek.s",
-	"9syscall/segattach.s",
-	"9syscall/segbrk.s",
-	"9syscall/segdetach.s",
-	"9syscall/segflush.s",
-	"9syscall/segfree.s",
-	"9syscall/semacquire.s",
-	"9syscall/semalt.s",
-	"9syscall/semrelease.s",
-	"9syscall/semsleep.s",
-	"9syscall/semwakeup.s",
-	"9syscall/sleep.s",
-	"9syscall/_stat.s",
-	"9syscall/stat.s",
-	"9syscall/sysr1.s",
-	"9syscall/tsemacquire.s",
-	"9syscall/unmount.s",
-	"9syscall/_wait.s",
-	"9syscall/_write.s",
-	"9syscall/_wstat.s",
-	"9syscall/wstat.s",
-	"9syscall/ziofree.s",
-	"9syscall/ziopread.s",
-	"9syscall/ziopwrite.s",
-	"fmt/dofmt.c",
-	"fmt/dorfmt.c",
-	"fmt/errfmt.c",
-	"fmt/fltfmt.c",
-	"fmt/fmt.c",
-	"fmt/fmtfd.c",
-	"fmt/fmtlock.c",
-	"fmt/fmtprint.c",
-	"fmt/fmtquote.c",
-	"fmt/fmtrune.c",
-	"fmt/fmtstr.c",
-	"fmt/fmtvprint.c",
-	"fmt/fprint.c",
-	"fmt/print.c",
-	"fmt/runefmtstr.c",
-	"fmt/runeseprint.c",
-	"fmt/runesmprint.c",
-	"fmt/runesnprint.c",
-	"fmt/runesprint.c",
-	"fmt/runevseprint.c",
-	"fmt/runevsmprint.c",
-	"fmt/runevsnprint.c",
-	"fmt/seprint.c",
-	"fmt/smprint.c",
-	"fmt/snprint.c",
-	"fmt/sprint.c",
-	"fmt/vfprint.c",
-	"fmt/vseprint.c",
-	"fmt/vsmprint.c",
-	"fmt/vsnprint.c",
-	"port/_assert.c",
-	"port/abs.c",
-	"port/asin.c",
-	"port/atan.c",
-	"port/atan2.c",
-	"port/atexit.c",
-	"port/atnotify.c",
-	"port/atof.c",
-	"port/atol.c",
-	"port/atoll.c",
-	"port/cistrcmp.c",
-	"port/cistrncmp.c",
-	"port/cistrstr.c",
-	"port/charstod.c",
-	"port/cleanname.c",
-	"port/ctype.c",
-	"port/encodefmt.c",
-	"port/execl.c",
-	"port/exp.c",
-	"port/fabs.c",
-	"port/floor.c",
-	"port/fmod.c",
-	"port/frand.c",
-	"port/frexp.c",
-	"port/getcallerpc.c",
-	"port/getfields.c",
-	"port/getuser.c",
-	"port/hangup.c",
-	"port/hypot.c",
-	"port/lnrand.c",
-	"port/lock.c",
-	"port/log.c",
-	"port/lrand.c",
-	"port/malloc.c",
-	"port/memccpy.c",
-	"port/memchr.c",
-	"port/memcmp.c",
-	"port/memmove.c",
-	"port/memset.c",
-	"port/mktemp.c",
-	"port/muldiv.c",
-	"port/nan.c",
-	"port/needsrcquote.c",
-	"port/netcrypt.c",
-	"port/netmkaddr.c",
-	"port/nrand.c",
-	"port/ntruerand.c",
-	"port/perror.c",
-	"port/pool.c",
-	"port/pow.c",
-	"port/pow10.c",
-	"port/profile.c",
-	"port/qsort.c",
-	"port/quote.c",
-	"port/rand.c",
-	"port/readn.c",
-	"port/rune.c",
-	"port/runebase.c",
-	"port/runebsearch.c",
-	"port/runestrcat.c",
-	"port/runestrchr.c",
-	"port/runestrcmp.c",
-	"port/runestrcpy.c",
-	"port/runestrecpy.c",
-	"port/runestrdup.c",
-	"port/runestrncat.c",
-	"port/runestrncmp.c",
-	"port/runestrncpy.c",
-	"port/runestrrchr.c",
-	"port/runestrlen.c",
-	"port/runestrstr.c",
-	"port/runetype.c",
-	"port/sin.c",
-	"port/sinh.c",
-	"port/sqrt.c",
-	"port/strcat.c",
-	"port/strchr.c",
-	"port/strcmp.c",
-	"port/strcpy.c",
-	"port/strecpy.c",
-	"port/strcspn.c",
-	"port/strdup.c",
-	"port/strlen.c",
-	"port/strncat.c",
-	"port/strncmp.c",
-	"port/strncpy.c",
-	"port/strpbrk.c",
-	"port/strrchr.c",
-	"port/strspn.c",
-	"port/strstr.c",
-	"port/strtod.c",
-	"port/strtok.c",
-	"port/strtol.c",
-	"port/strtoll.c",
-	"port/strtoul.c",
-	"port/strtoull.c",
-	"port/tan.c",
-	"port/tanh.c",
-	"port/tokenize.c",
-	"port/toupper.c",
-	"port/utfecpy.c",
-	"port/utflen.c",
-	"port/utfnlen.c",
-	"port/utfrune.c",
-	"port/utfrrune.c",
-	"port/utfutf.c",
-	"port/u16.c",
-	"port/u32.c",
-	"port/u64.c",
-	"amd64/_seek.c",
-	"amd64/notejmp.c",
-	"amd64/cycles.c",
-	"amd64/argv0.c",
-	"amd64/rdpmc.c",
-	"amd64/setjmp.s",
-	"amd64/sqrt.s",
-	"amd64/tas.s",
-	"amd64/atom.S",
-	"amd64/main9.S"
+	"Include": [
+		"../klib.json"
 	],
+	"Install": "/$ARCH/lib/",
+	"Library": "klibc.a",
+	"Name": "KernelLibc",
 	"Post": [
-	"rm 9syscall/*.s"
+		"rm 9syscall/*.s"
+	],
+	"Projects": [
+		"9syscall/9syscall.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"SourceFiles": [
+		"9sys/abort.c",
+		"9sys/access.c",
+		"9sys/announce.c",
+		"9sys/convD2M.c",
+		"9sys/convM2D.c",
+		"9sys/convM2S.c",
+		"9sys/convS2M.c",
+		"9sys/cputime.c",
+		"9sys/ctime.c",
+		"9sys/dial.c",
+		"9sys/dirfstat.c",
+		"9sys/dirfwstat.c",
+		"9sys/dirmodefmt.c",
+		"9sys/dirread.c",
+		"9sys/dirstat.c",
+		"9sys/dirwstat.c",
+		"9sys/fcallfmt.c",
+		"9sys/fork.c",
+		"9sys/getnetconninfo.c",
+		"9sys/getenv.c",
+		"9sys/getpid.c",
+		"9sys/getppid.c",
+		"9sys/getwd.c",
+		"9sys/iounit.c",
+		"9sys/nulldir.c",
+		"9sys/postnote.c",
+		"9sys/privalloc.c",
+		"9sys/pushssl.c",
+		"9sys/pushtls.c",
+		"9sys/putenv.c",
+		"9sys/qlock.c",
+		"9sys/read.c",
+		"9sys/read9pmsg.c",
+		"9sys/readv.c",
+		"9sys/rerrstr.c",
+		"9sys/sbrk.c",
+		"9sys/setnetmtpt.c",
+		"9sys/sysfatal.c",
+		"9sys/syslog.c",
+		"9sys/sysname.c",
+		"9sys/time.c",
+		"9sys/times.c",
+		"9sys/tm2sec.c",
+		"9sys/truerand.c",
+		"9sys/wait.c",
+		"9sys/waitpid.c",
+		"9sys/werrstr.c",
+		"9sys/write.c",
+		"9sys/writev.c",
+		"9syscall/alarm.s",
+		"9syscall/await.s",
+		"9syscall/bind.s",
+		"9syscall/brk_.s",
+		"9syscall/chdir.s",
+		"9syscall/close.s",
+		"9syscall/create.s",
+		"9syscall/dup.s",
+		"9syscall/_errstr.s",
+		"9syscall/errstr.s",
+		"9syscall/execac.s",
+		"9syscall/exec.s",
+		"9syscall/_exits.s",
+		"9syscall/fauth.s",
+		"9syscall/fd2path.s",
+		"9syscall/_fsession.s",
+		"9syscall/_fstat.s",
+		"9syscall/fstat.s",
+		"9syscall/fversion.s",
+		"9syscall/_fwstat.s",
+		"9syscall/fwstat.s",
+		"9syscall/_mount.s",
+		"9syscall/mount.s",
+		"9syscall/nixsyscall.s",
+		"9syscall/noted.s",
+		"9syscall/notify.s",
+		"9syscall/nsec.s",
+		"9syscall/open.s",
+		"9syscall/oseek.s",
+		"9syscall/pipe.s",
+		"9syscall/pread.s",
+		"9syscall/pwrite.s",
+		"9syscall/_read.s",
+		"9syscall/remove.s",
+		"9syscall/rendezvous.s",
+		"9syscall/rfork.s",
+		"9syscall/seek.s",
+		"9syscall/segattach.s",
+		"9syscall/segbrk.s",
+		"9syscall/segdetach.s",
+		"9syscall/segflush.s",
+		"9syscall/segfree.s",
+		"9syscall/semacquire.s",
+		"9syscall/semalt.s",
+		"9syscall/semrelease.s",
+		"9syscall/semsleep.s",
+		"9syscall/semwakeup.s",
+		"9syscall/sleep.s",
+		"9syscall/_stat.s",
+		"9syscall/stat.s",
+		"9syscall/sysr1.s",
+		"9syscall/tsemacquire.s",
+		"9syscall/unmount.s",
+		"9syscall/_wait.s",
+		"9syscall/_write.s",
+		"9syscall/_wstat.s",
+		"9syscall/wstat.s",
+		"9syscall/ziofree.s",
+		"9syscall/ziopread.s",
+		"9syscall/ziopwrite.s",
+		"fmt/dofmt.c",
+		"fmt/dorfmt.c",
+		"fmt/errfmt.c",
+		"fmt/fltfmt.c",
+		"fmt/fmt.c",
+		"fmt/fmtfd.c",
+		"fmt/fmtlock.c",
+		"fmt/fmtprint.c",
+		"fmt/fmtquote.c",
+		"fmt/fmtrune.c",
+		"fmt/fmtstr.c",
+		"fmt/fmtvprint.c",
+		"fmt/fprint.c",
+		"fmt/print.c",
+		"fmt/runefmtstr.c",
+		"fmt/runeseprint.c",
+		"fmt/runesmprint.c",
+		"fmt/runesnprint.c",
+		"fmt/runesprint.c",
+		"fmt/runevseprint.c",
+		"fmt/runevsmprint.c",
+		"fmt/runevsnprint.c",
+		"fmt/seprint.c",
+		"fmt/smprint.c",
+		"fmt/snprint.c",
+		"fmt/sprint.c",
+		"fmt/vfprint.c",
+		"fmt/vseprint.c",
+		"fmt/vsmprint.c",
+		"fmt/vsnprint.c",
+		"port/_assert.c",
+		"port/abs.c",
+		"port/asin.c",
+		"port/atan.c",
+		"port/atan2.c",
+		"port/atexit.c",
+		"port/atnotify.c",
+		"port/atof.c",
+		"port/atol.c",
+		"port/atoll.c",
+		"port/cistrcmp.c",
+		"port/cistrncmp.c",
+		"port/cistrstr.c",
+		"port/charstod.c",
+		"port/cleanname.c",
+		"port/ctype.c",
+		"port/encodefmt.c",
+		"port/execl.c",
+		"port/exp.c",
+		"port/fabs.c",
+		"port/floor.c",
+		"port/fmod.c",
+		"port/frand.c",
+		"port/frexp.c",
+		"port/getcallerpc.c",
+		"port/getfields.c",
+		"port/getuser.c",
+		"port/hangup.c",
+		"port/hypot.c",
+		"port/lnrand.c",
+		"port/lock.c",
+		"port/log.c",
+		"port/lrand.c",
+		"port/malloc.c",
+		"port/memccpy.c",
+		"port/memchr.c",
+		"port/memcmp.c",
+		"port/memmove.c",
+		"port/memset.c",
+		"port/mktemp.c",
+		"port/muldiv.c",
+		"port/nan.c",
+		"port/needsrcquote.c",
+		"port/netcrypt.c",
+		"port/netmkaddr.c",
+		"port/nrand.c",
+		"port/ntruerand.c",
+		"port/perror.c",
+		"port/pool.c",
+		"port/pow.c",
+		"port/pow10.c",
+		"port/profile.c",
+		"port/qsort.c",
+		"port/quote.c",
+		"port/rand.c",
+		"port/readn.c",
+		"port/rune.c",
+		"port/runebase.c",
+		"port/runebsearch.c",
+		"port/runestrcat.c",
+		"port/runestrchr.c",
+		"port/runestrcmp.c",
+		"port/runestrcpy.c",
+		"port/runestrecpy.c",
+		"port/runestrdup.c",
+		"port/runestrncat.c",
+		"port/runestrncmp.c",
+		"port/runestrncpy.c",
+		"port/runestrrchr.c",
+		"port/runestrlen.c",
+		"port/runestrstr.c",
+		"port/runetype.c",
+		"port/sin.c",
+		"port/sinh.c",
+		"port/sqrt.c",
+		"port/strcat.c",
+		"port/strchr.c",
+		"port/strcmp.c",
+		"port/strcpy.c",
+		"port/strecpy.c",
+		"port/strcspn.c",
+		"port/strdup.c",
+		"port/strlen.c",
+		"port/strncat.c",
+		"port/strncmp.c",
+		"port/strncpy.c",
+		"port/strpbrk.c",
+		"port/strrchr.c",
+		"port/strspn.c",
+		"port/strstr.c",
+		"port/strtod.c",
+		"port/strtok.c",
+		"port/strtol.c",
+		"port/strtoll.c",
+		"port/strtoul.c",
+		"port/strtoull.c",
+		"port/tan.c",
+		"port/tanh.c",
+		"port/tokenize.c",
+		"port/toupper.c",
+		"port/utfecpy.c",
+		"port/utflen.c",
+		"port/utfnlen.c",
+		"port/utfrune.c",
+		"port/utfrrune.c",
+		"port/utfutf.c",
+		"port/u16.c",
+		"port/u32.c",
+		"port/u64.c",
+		"amd64/_seek.c",
+		"amd64/notejmp.c",
+		"amd64/cycles.c",
+		"amd64/argv0.c",
+		"amd64/rdpmc.c",
+		"amd64/setjmp.s",
+		"amd64/sqrt.s",
+		"amd64/tas.s",
+		"amd64/atom.S",
+		"amd64/main9.S"
+	]
 }

sys/src/libc/libc.json

@@ -1,274 +1,274 @@
 {
-	"Name": "Libc",
-	"Library": "libc.a",
-	"Include": ["../lib.json"],
-    "Projects": [
-	"9syscall/9syscall.json"
-	],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"9sys/abort.c",
-	"9sys/access.c",
-	"9sys/announce.c",
-	"9sys/convD2M.c",
-	"9sys/convM2D.c",
-	"9sys/convM2S.c",
-	"9sys/convS2M.c",
-	"9sys/cputime.c",
-	"9sys/ctime.c",
-	"9sys/dial.c",
-	"9sys/dirfstat.c",
-	"9sys/dirfwstat.c",
-	"9sys/dirmodefmt.c",
-	"9sys/dirread.c",
-	"9sys/dirstat.c",
-	"9sys/dirwstat.c",
-	"9sys/fcallfmt.c",
-	"9sys/fork.c",
-	"9sys/getnetconninfo.c",
-	"9sys/getenv.c",
-	"9sys/getpid.c",
-	"9sys/getppid.c",
-	"9sys/getwd.c",
-	"9sys/iounit.c",
-	"9sys/nulldir.c",
-	"9sys/postnote.c",
-	"9sys/privalloc.c",
-	"9sys/pushssl.c",
-	"9sys/pushtls.c",
-	"9sys/putenv.c",
-	"9sys/qlock.c",
-	"9sys/read.c",
-	"9sys/read9pmsg.c",
-	"9sys/readv.c",
-	"9sys/rerrstr.c",
-	"9sys/sbrk.c",
-	"9sys/setnetmtpt.c",
-	"9sys/sysfatal.c",
-	"9sys/syslog.c",
-	"9sys/sysname.c",
-	"9sys/time.c",
-	"9sys/times.c",
-	"9sys/tm2sec.c",
-	"9sys/truerand.c",
-	"9sys/wait.c",
-	"9sys/waitpid.c",
-	"9sys/werrstr.c",
-	"9sys/write.c",
-	"9sys/writev.c",
-	"9syscall/alarm.s",
-	"9syscall/await.s",
-	"9syscall/bind.s",
-	"9syscall/brk_.s",
-	"9syscall/chdir.s",
-	"9syscall/close.s",
-	"9syscall/create.s",
-	"9syscall/dup.s",
-	"9syscall/_errstr.s",
-	"9syscall/errstr.s",
-	"9syscall/execac.s",
-	"9syscall/exec.s",
-	"9syscall/_exits.s",
-	"9syscall/fauth.s",
-	"9syscall/fd2path.s",
-	"9syscall/_fsession.s",
-	"9syscall/_fstat.s",
-	"9syscall/fstat.s",
-	"9syscall/fversion.s",
-	"9syscall/_fwstat.s",
-	"9syscall/fwstat.s",
-	"9syscall/_mount.s",
-	"9syscall/mount.s",
-	"9syscall/nixsyscall.s",
-	"9syscall/noted.s",
-	"9syscall/notify.s",
-	"9syscall/nsec.s",
-	"9syscall/open.s",
-	"9syscall/oseek.s",
-	"9syscall/pipe.s",
-	"9syscall/pread.s",
-	"9syscall/pwrite.s",
-	"9syscall/_read.s",
-	"9syscall/remove.s",
-	"9syscall/rendezvous.s",
-	"9syscall/rfork.s",
-	"9syscall/seek.s",
-	"9syscall/segattach.s",
-	"9syscall/segbrk.s",
-	"9syscall/segdetach.s",
-	"9syscall/segflush.s",
-	"9syscall/segfree.s",
-	"9syscall/semacquire.s",
-	"9syscall/semalt.s",
-	"9syscall/semrelease.s",
-	"9syscall/semsleep.s",
-	"9syscall/semwakeup.s",
-	"9syscall/sleep.s",
-	"9syscall/_stat.s",
-	"9syscall/stat.s",
-	"9syscall/sysr1.s",
-	"9syscall/tsemacquire.s",
-	"9syscall/unmount.s",
-	"9syscall/_wait.s",
-	"9syscall/_write.s",
-	"9syscall/_wstat.s",
-	"9syscall/wstat.s",
-	"9syscall/ziofree.s",
-	"9syscall/ziopread.s",
-	"9syscall/ziopwrite.s",
-	"fmt/dofmt.c",
-	"fmt/dorfmt.c",
-	"fmt/errfmt.c",
-	"fmt/fltfmt.c",
-	"fmt/fmt.c",
-	"fmt/fmtfd.c",
-	"fmt/fmtlock.c",
-	"fmt/fmtprint.c",
-	"fmt/fmtquote.c",
-	"fmt/fmtrune.c",
-	"fmt/fmtstr.c",
-	"fmt/fmtvprint.c",
-	"fmt/fprint.c",
-	"fmt/print.c",
-	"fmt/runefmtstr.c",
-	"fmt/runeseprint.c",
-	"fmt/runesmprint.c",
-	"fmt/runesnprint.c",
-	"fmt/runesprint.c",
-	"fmt/runevseprint.c",
-	"fmt/runevsmprint.c",
-	"fmt/runevsnprint.c",
-	"fmt/seprint.c",
-	"fmt/smprint.c",
-	"fmt/snprint.c",
-	"fmt/sprint.c",
-	"fmt/vfprint.c",
-	"fmt/vseprint.c",
-	"fmt/vsmprint.c",
-	"fmt/vsnprint.c",
-	"port/_assert.c",
-	"port/abs.c",
-	"port/asin.c",
-	"port/atan.c",
-	"port/atan2.c",
-	"port/atexit.c",
-	"port/atnotify.c",
-	"port/atof.c",
-	"port/atol.c",
-	"port/atoll.c",
-	"port/cistrcmp.c",
-	"port/cistrncmp.c",
-	"port/cistrstr.c",
-	"port/charstod.c",
-	"port/cleanname.c",
-	"port/ctype.c",
-	"port/encodefmt.c",
-	"port/execl.c",
-	"port/exp.c",
-	"port/fabs.c",
-	"port/floor.c",
-	"port/fmod.c",
-	"port/frand.c",
-	"port/frexp.c",
-	"port/getcallerpc.c",
-	"port/getfields.c",
-	"port/getuser.c",
-	"port/hangup.c",
-	"port/hypot.c",
-	"port/lnrand.c",
-	"port/lock.c",
-	"port/log.c",
-	"port/lrand.c",
-	"port/malloc.c",
-	"port/memccpy.c",
-	"port/memchr.c",
-	"port/memcmp.c",
-	"port/memmove.c",
-	"port/memset.c",
-	"port/mktemp.c",
-	"port/muldiv.c",
-	"port/nan.c",
-	"port/needsrcquote.c",
-	"port/netcrypt.c",
-	"port/netmkaddr.c",
-	"port/nrand.c",
-	"port/ntruerand.c",
-	"port/perror.c",
-	"port/pool.c",
-	"port/pow.c",
-	"port/pow10.c",
-	"port/profile.c",
-	"port/qsort.c",
-	"port/quote.c",
-	"port/rand.c",
-	"port/readn.c",
-	"port/rune.c",
-	"port/runebase.c",
-	"port/runebsearch.c",
-	"port/runestrcat.c",
-	"port/runestrchr.c",
-	"port/runestrcmp.c",
-	"port/runestrcpy.c",
-	"port/runestrecpy.c",
-	"port/runestrdup.c",
-	"port/runestrncat.c",
-	"port/runestrncmp.c",
-	"port/runestrncpy.c",
-	"port/runestrrchr.c",
-	"port/runestrlen.c",
-	"port/runestrstr.c",
-	"port/runetype.c",
-	"port/sin.c",
-	"port/sinh.c",
-	"port/sqrt.c",
-	"port/strcat.c",
-	"port/strchr.c",
-	"port/strcmp.c",
-	"port/strcpy.c",
-	"port/strecpy.c",
-	"port/strcspn.c",
-	"port/strdup.c",
-	"port/strlen.c",
-	"port/strncat.c",
-	"port/strncmp.c",
-	"port/strncpy.c",
-	"port/strpbrk.c",
-	"port/strrchr.c",
-	"port/strspn.c",
-	"port/strstr.c",
-	"port/strtod.c",
-	"port/strtok.c",
-	"port/strtol.c",
-	"port/strtoll.c",
-	"port/strtoul.c",
-	"port/strtoull.c",
-	"port/tan.c",
-	"port/tanh.c",
-	"port/tokenize.c",
-	"port/toupper.c",
-	"port/utfecpy.c",
-	"port/utflen.c",
-	"port/utfnlen.c",
-	"port/utfrune.c",
-	"port/utfrrune.c",
-	"port/utfutf.c",
-	"port/u16.c",
-	"port/u32.c",
-	"port/u64.c",
-	"amd64/_seek.c",
-	"amd64/notejmp.c",
-	"amd64/cycles.c",
-	"amd64/argv0.c",
-	"amd64/rdpmc.c",
-	"amd64/setjmp.s",
-	"amd64/sqrt.s",
-	"amd64/tas.s",
-	"amd64/atom.S",
-	"amd64/main9.S"
+	"Include": [
+		"../lib.json"
 	],
+	"Install": "/$ARCH/lib/",
+	"Library": "libc.a",
+	"Name": "Libc",
 	"Post": [
-	"rm 9syscall/*.s"
+		"rm 9syscall/*.s"
+	],
+	"Projects": [
+		"9syscall/9syscall.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"SourceFiles": [
+		"9sys/abort.c",
+		"9sys/access.c",
+		"9sys/announce.c",
+		"9sys/convD2M.c",
+		"9sys/convM2D.c",
+		"9sys/convM2S.c",
+		"9sys/convS2M.c",
+		"9sys/cputime.c",
+		"9sys/ctime.c",
+		"9sys/dial.c",
+		"9sys/dirfstat.c",
+		"9sys/dirfwstat.c",
+		"9sys/dirmodefmt.c",
+		"9sys/dirread.c",
+		"9sys/dirstat.c",
+		"9sys/dirwstat.c",
+		"9sys/fcallfmt.c",
+		"9sys/fork.c",
+		"9sys/getnetconninfo.c",
+		"9sys/getenv.c",
+		"9sys/getpid.c",
+		"9sys/getppid.c",
+		"9sys/getwd.c",
+		"9sys/iounit.c",
+		"9sys/nulldir.c",
+		"9sys/postnote.c",
+		"9sys/privalloc.c",
+		"9sys/pushssl.c",
+		"9sys/pushtls.c",
+		"9sys/putenv.c",
+		"9sys/qlock.c",
+		"9sys/read.c",
+		"9sys/read9pmsg.c",
+		"9sys/readv.c",
+		"9sys/rerrstr.c",
+		"9sys/sbrk.c",
+		"9sys/setnetmtpt.c",
+		"9sys/sysfatal.c",
+		"9sys/syslog.c",
+		"9sys/sysname.c",
+		"9sys/time.c",
+		"9sys/times.c",
+		"9sys/tm2sec.c",
+		"9sys/truerand.c",
+		"9sys/wait.c",
+		"9sys/waitpid.c",
+		"9sys/werrstr.c",
+		"9sys/write.c",
+		"9sys/writev.c",
+		"9syscall/alarm.s",
+		"9syscall/await.s",
+		"9syscall/bind.s",
+		"9syscall/brk_.s",
+		"9syscall/chdir.s",
+		"9syscall/close.s",
+		"9syscall/create.s",
+		"9syscall/dup.s",
+		"9syscall/_errstr.s",
+		"9syscall/errstr.s",
+		"9syscall/execac.s",
+		"9syscall/exec.s",
+		"9syscall/_exits.s",
+		"9syscall/fauth.s",
+		"9syscall/fd2path.s",
+		"9syscall/_fsession.s",
+		"9syscall/_fstat.s",
+		"9syscall/fstat.s",
+		"9syscall/fversion.s",
+		"9syscall/_fwstat.s",
+		"9syscall/fwstat.s",
+		"9syscall/_mount.s",
+		"9syscall/mount.s",
+		"9syscall/nixsyscall.s",
+		"9syscall/noted.s",
+		"9syscall/notify.s",
+		"9syscall/nsec.s",
+		"9syscall/open.s",
+		"9syscall/oseek.s",
+		"9syscall/pipe.s",
+		"9syscall/pread.s",
+		"9syscall/pwrite.s",
+		"9syscall/_read.s",
+		"9syscall/remove.s",
+		"9syscall/rendezvous.s",
+		"9syscall/rfork.s",
+		"9syscall/seek.s",
+		"9syscall/segattach.s",
+		"9syscall/segbrk.s",
+		"9syscall/segdetach.s",
+		"9syscall/segflush.s",
+		"9syscall/segfree.s",
+		"9syscall/semacquire.s",
+		"9syscall/semalt.s",
+		"9syscall/semrelease.s",
+		"9syscall/semsleep.s",
+		"9syscall/semwakeup.s",
+		"9syscall/sleep.s",
+		"9syscall/_stat.s",
+		"9syscall/stat.s",
+		"9syscall/sysr1.s",
+		"9syscall/tsemacquire.s",
+		"9syscall/unmount.s",
+		"9syscall/_wait.s",
+		"9syscall/_write.s",
+		"9syscall/_wstat.s",
+		"9syscall/wstat.s",
+		"9syscall/ziofree.s",
+		"9syscall/ziopread.s",
+		"9syscall/ziopwrite.s",
+		"fmt/dofmt.c",
+		"fmt/dorfmt.c",
+		"fmt/errfmt.c",
+		"fmt/fltfmt.c",
+		"fmt/fmt.c",
+		"fmt/fmtfd.c",
+		"fmt/fmtlock.c",
+		"fmt/fmtprint.c",
+		"fmt/fmtquote.c",
+		"fmt/fmtrune.c",
+		"fmt/fmtstr.c",
+		"fmt/fmtvprint.c",
+		"fmt/fprint.c",
+		"fmt/print.c",
+		"fmt/runefmtstr.c",
+		"fmt/runeseprint.c",
+		"fmt/runesmprint.c",
+		"fmt/runesnprint.c",
+		"fmt/runesprint.c",
+		"fmt/runevseprint.c",
+		"fmt/runevsmprint.c",
+		"fmt/runevsnprint.c",
+		"fmt/seprint.c",
+		"fmt/smprint.c",
+		"fmt/snprint.c",
+		"fmt/sprint.c",
+		"fmt/vfprint.c",
+		"fmt/vseprint.c",
+		"fmt/vsmprint.c",
+		"fmt/vsnprint.c",
+		"port/_assert.c",
+		"port/abs.c",
+		"port/asin.c",
+		"port/atan.c",
+		"port/atan2.c",
+		"port/atexit.c",
+		"port/atnotify.c",
+		"port/atof.c",
+		"port/atol.c",
+		"port/atoll.c",
+		"port/cistrcmp.c",
+		"port/cistrncmp.c",
+		"port/cistrstr.c",
+		"port/charstod.c",
+		"port/cleanname.c",
+		"port/ctype.c",
+		"port/encodefmt.c",
+		"port/execl.c",
+		"port/exp.c",
+		"port/fabs.c",
+		"port/floor.c",
+		"port/fmod.c",
+		"port/frand.c",
+		"port/frexp.c",
+		"port/getcallerpc.c",
+		"port/getfields.c",
+		"port/getuser.c",
+		"port/hangup.c",
+		"port/hypot.c",
+		"port/lnrand.c",
+		"port/lock.c",
+		"port/log.c",
+		"port/lrand.c",
+		"port/malloc.c",
+		"port/memccpy.c",
+		"port/memchr.c",
+		"port/memcmp.c",
+		"port/memmove.c",
+		"port/memset.c",
+		"port/mktemp.c",
+		"port/muldiv.c",
+		"port/nan.c",
+		"port/needsrcquote.c",
+		"port/netcrypt.c",
+		"port/netmkaddr.c",
+		"port/nrand.c",
+		"port/ntruerand.c",
+		"port/perror.c",
+		"port/pool.c",
+		"port/pow.c",
+		"port/pow10.c",
+		"port/profile.c",
+		"port/qsort.c",
+		"port/quote.c",
+		"port/rand.c",
+		"port/readn.c",
+		"port/rune.c",
+		"port/runebase.c",
+		"port/runebsearch.c",
+		"port/runestrcat.c",
+		"port/runestrchr.c",
+		"port/runestrcmp.c",
+		"port/runestrcpy.c",
+		"port/runestrecpy.c",
+		"port/runestrdup.c",
+		"port/runestrncat.c",
+		"port/runestrncmp.c",
+		"port/runestrncpy.c",
+		"port/runestrrchr.c",
+		"port/runestrlen.c",
+		"port/runestrstr.c",
+		"port/runetype.c",
+		"port/sin.c",
+		"port/sinh.c",
+		"port/sqrt.c",
+		"port/strcat.c",
+		"port/strchr.c",
+		"port/strcmp.c",
+		"port/strcpy.c",
+		"port/strecpy.c",
+		"port/strcspn.c",
+		"port/strdup.c",
+		"port/strlen.c",
+		"port/strncat.c",
+		"port/strncmp.c",
+		"port/strncpy.c",
+		"port/strpbrk.c",
+		"port/strrchr.c",
+		"port/strspn.c",
+		"port/strstr.c",
+		"port/strtod.c",
+		"port/strtok.c",
+		"port/strtol.c",
+		"port/strtoll.c",
+		"port/strtoul.c",
+		"port/strtoull.c",
+		"port/tan.c",
+		"port/tanh.c",
+		"port/tokenize.c",
+		"port/toupper.c",
+		"port/utfecpy.c",
+		"port/utflen.c",
+		"port/utfnlen.c",
+		"port/utfrune.c",
+		"port/utfrrune.c",
+		"port/utfutf.c",
+		"port/u16.c",
+		"port/u32.c",
+		"port/u64.c",
+		"amd64/_seek.c",
+		"amd64/notejmp.c",
+		"amd64/cycles.c",
+		"amd64/argv0.c",
+		"amd64/rdpmc.c",
+		"amd64/setjmp.s",
+		"amd64/sqrt.s",
+		"amd64/tas.s",
+		"amd64/atom.S",
+		"amd64/main9.S"
+	]
 }

sys/src/libcomplete/libcomplete.json

@@ -1,11 +1,11 @@
 {
-	"Name": "libcomplete",
-	"Library": "libcomplete.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"complete.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libcomplete.a",
+	"Name": "libcomplete",
+	"SourceFiles": [
+		"complete.c"
+	]
 }

sys/src/libcontrol/libcontrol.json

@@ -1,26 +1,26 @@
 {
-	"Name": "libcontrol",
-	"Library": "libcontrol.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"box.c",
-	"button.c",
-	"cache.c",
-	"control.c",
-	"entry.c",
-	"group.c",
-	"keyboard.c",
-	"label.c",
-	"menu.c",
-	"radiobutton.c",
-	"scribble.c",
-	"slider.c",
-	"tabs.c",
-	"text.c",
-	"textbutton.c",
-	"textbutton3.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libcontrol.a",
+	"Name": "libcontrol",
+	"SourceFiles": [
+		"box.c",
+		"button.c",
+		"cache.c",
+		"control.c",
+		"entry.c",
+		"group.c",
+		"keyboard.c",
+		"label.c",
+		"menu.c",
+		"radiobutton.c",
+		"scribble.c",
+		"slider.c",
+		"tabs.c",
+		"text.c",
+		"textbutton.c",
+		"textbutton3.c"
+	]
 }

sys/src/libdisk/libdisk.json

@@ -1,13 +1,13 @@
 {
-	"Name": "libdisk",
-	"Library": "libdisk.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"disk.c",
-	"proto.c",
-	"scsi.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libdisk.a",
+	"Name": "libdisk",
+	"SourceFiles": [
+		"disk.c",
+		"proto.c",
+		"scsi.c"
+	]
 }

sys/src/libdraw/klibdraw.json

@@ -1,66 +1,66 @@
 {
-	"Name": "KernelLibdraw",
-	"Library": "klibdraw.a",
-	"Include": ["../klib.json"],
-	"Pre": [
+	"Include": [
+		"../klib.json"
 	],
+	"Install": "/$ARCH/lib/",
+	"Library": "klibdraw.a",
+	"Name": "KernelLibdraw",
 	"SourceFiles": [
-	"alloc.c",
-	"allocimagemix.c",
-	"arith.c",
-	"bezier.c",
-	"border.c",
-	"buildfont.c",
-	"bytesperline.c",
-	"chan.c",
-	"cloadimage.c",
-	"computil.c",
-	"creadimage.c",
-	"debug.c",
-	"defont.c",
-	"draw.c",
-	"drawrepl.c",
-	"egetrect.c",
-	"ellipse.c",
-	"emenuhit.c",
-	"event.c",
-	"fmt.c",
-	"font.c",
-	"freesubfont.c",
-	"getdefont.c",
-	"getrect.c",
-	"getsubfont.c",
-	"icossin.c",
-	"icossin2.c",
-	"init.c",
-	"keyboard.c",
-	"line.c",
-	"menuhit.c",
-	"mkfont.c",
-	"mouse.c",
-	"newwindow.c",
-	"openfont.c",
-	"poly.c",
-	"loadimage.c",
-	"readcolmap.c",
-	"readimage.c",
-	"readsubfont.c",
-	"rectclip.c",
-	"replclipr.c",
-	"rgb.c",
-	"scroll.c",
-	"string.c",
-	"stringbg.c",
-	"stringsubfont.c",
-	"stringwidth.c",
-	"subfont.c",
-	"subfontcache.c",
-	"subfontname.c",
-	"unloadimage.c",
-	"window.c",
-	"writecolmap.c",
-	"writeimage.c",
-	"writesubfont.c"
-	],
-	"Install": "/$ARCH/lib/"
+		"alloc.c",
+		"allocimagemix.c",
+		"arith.c",
+		"bezier.c",
+		"border.c",
+		"buildfont.c",
+		"bytesperline.c",
+		"chan.c",
+		"cloadimage.c",
+		"computil.c",
+		"creadimage.c",
+		"debug.c",
+		"defont.c",
+		"draw.c",
+		"drawrepl.c",
+		"egetrect.c",
+		"ellipse.c",
+		"emenuhit.c",
+		"event.c",
+		"fmt.c",
+		"font.c",
+		"freesubfont.c",
+		"getdefont.c",
+		"getrect.c",
+		"getsubfont.c",
+		"icossin.c",
+		"icossin2.c",
+		"init.c",
+		"keyboard.c",
+		"line.c",
+		"menuhit.c",
+		"mkfont.c",
+		"mouse.c",
+		"newwindow.c",
+		"openfont.c",
+		"poly.c",
+		"loadimage.c",
+		"readcolmap.c",
+		"readimage.c",
+		"readsubfont.c",
+		"rectclip.c",
+		"replclipr.c",
+		"rgb.c",
+		"scroll.c",
+		"string.c",
+		"stringbg.c",
+		"stringsubfont.c",
+		"stringwidth.c",
+		"subfont.c",
+		"subfontcache.c",
+		"subfontname.c",
+		"unloadimage.c",
+		"window.c",
+		"writecolmap.c",
+		"writeimage.c",
+		"writesubfont.c"
+	]
 }

sys/src/libdraw/libdraw.json

@@ -1,66 +1,66 @@
 {
-	"Name": "Libdraw",
-	"Library": "libdraw.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"alloc.c",
-	"allocimagemix.c",
-	"arith.c",
-	"bezier.c",
-	"border.c",
-	"buildfont.c",
-	"bytesperline.c",
-	"chan.c",
-	"cloadimage.c",
-	"computil.c",
-	"creadimage.c",
-	"debug.c",
-	"defont.c",
-	"draw.c",
-	"drawrepl.c",
-	"egetrect.c",
-	"ellipse.c",
-	"emenuhit.c",
-	"event.c",
-	"fmt.c",
-	"font.c",
-	"freesubfont.c",
-	"getdefont.c",
-	"getrect.c",
-	"getsubfont.c",
-	"icossin.c",
-	"icossin2.c",
-	"init.c",
-	"keyboard.c",
-	"line.c",
-	"menuhit.c",
-	"mkfont.c",
-	"mouse.c",
-	"newwindow.c",
-	"openfont.c",
-	"poly.c",
-	"loadimage.c",
-	"readcolmap.c",
-	"readimage.c",
-	"readsubfont.c",
-	"rectclip.c",
-	"replclipr.c",
-	"rgb.c",
-	"scroll.c",
-	"string.c",
-	"stringbg.c",
-	"stringsubfont.c",
-	"stringwidth.c",
-	"subfont.c",
-	"subfontcache.c",
-	"subfontname.c",
-	"unloadimage.c",
-	"window.c",
-	"writecolmap.c",
-	"writeimage.c",
-	"writesubfont.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libdraw.a",
+	"Name": "Libdraw",
+	"SourceFiles": [
+		"alloc.c",
+		"allocimagemix.c",
+		"arith.c",
+		"bezier.c",
+		"border.c",
+		"buildfont.c",
+		"bytesperline.c",
+		"chan.c",
+		"cloadimage.c",
+		"computil.c",
+		"creadimage.c",
+		"debug.c",
+		"defont.c",
+		"draw.c",
+		"drawrepl.c",
+		"egetrect.c",
+		"ellipse.c",
+		"emenuhit.c",
+		"event.c",
+		"fmt.c",
+		"font.c",
+		"freesubfont.c",
+		"getdefont.c",
+		"getrect.c",
+		"getsubfont.c",
+		"icossin.c",
+		"icossin2.c",
+		"init.c",
+		"keyboard.c",
+		"line.c",
+		"menuhit.c",
+		"mkfont.c",
+		"mouse.c",
+		"newwindow.c",
+		"openfont.c",
+		"poly.c",
+		"loadimage.c",
+		"readcolmap.c",
+		"readimage.c",
+		"readsubfont.c",
+		"rectclip.c",
+		"replclipr.c",
+		"rgb.c",
+		"scroll.c",
+		"string.c",
+		"stringbg.c",
+		"stringsubfont.c",
+		"stringwidth.c",
+		"subfont.c",
+		"subfontcache.c",
+		"subfontname.c",
+		"unloadimage.c",
+		"window.c",
+		"writecolmap.c",
+		"writeimage.c",
+		"writesubfont.c"
+	]
 }

sys/src/libflate/libflate.json

@@ -1,21 +1,21 @@
 {
-	"Name": "libflate",
-	"Library": "libflate.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"deflate.c",
-	"deflatezlib.c",
-	"deflateblock.c",
-	"deflatezlibblock.c",
-	"inflate.c",
-	"inflatezlib.c",
-	"inflateblock.c",
-	"inflatezlibblock.c",
-	"flateerr.c",
-	"crc.c",
-	"adler.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libflate.a",
+	"Name": "libflate",
+	"SourceFiles": [
+		"deflate.c",
+		"deflatezlib.c",
+		"deflateblock.c",
+		"deflatezlibblock.c",
+		"inflate.c",
+		"inflatezlib.c",
+		"inflateblock.c",
+		"inflatezlibblock.c",
+		"flateerr.c",
+		"crc.c",
+		"adler.c"
+	]
 }

sys/src/libframe/libframe.json

@@ -1,19 +1,19 @@
 {
-	"Name": "libframe",
-	"Library": "libframe.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"frbox.c",
-	"frdraw.c",
-	"frdelete.c",
-	"frinit.c",
-	"frinsert.c",
-	"frptofchar.c",
-	"frselect.c",
-	"frstr.c",
-	"frutil.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libframe.a",
+	"Name": "libframe",
+	"SourceFiles": [
+		"frbox.c",
+		"frdraw.c",
+		"frdelete.c",
+		"frinit.c",
+		"frinsert.c",
+		"frptofchar.c",
+		"frselect.c",
+		"frstr.c",
+		"frutil.c"
+	]
 }

sys/src/libgeometry/libgeometry.json

@@ -1,16 +1,16 @@
 {
-	"Name": "libgeometry",
-	"Library": "libgeometry.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"arith3.c",
-	"matrix.c",
-	"qball.c",
-	"quaternion.c",
-	"transform.c",
-	"tstack.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libgeometry.a",
+	"Name": "libgeometry",
+	"SourceFiles": [
+		"arith3.c",
+		"matrix.c",
+		"qball.c",
+		"quaternion.c",
+		"transform.c",
+		"tstack.c"
+	]
 }

sys/src/libhtml/libhtml.json

@@ -1,14 +1,14 @@
 {
-	"Name": "libhtml",
-	"Library": "libhtml.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"build.c",
-	"lex.c",
-	"strinttab.c",
-	"utils.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libhtml.a",
+	"Name": "libhtml",
+	"SourceFiles": [
+		"build.c",
+		"lex.c",
+		"strinttab.c",
+		"utils.c"
+	]
 }

sys/src/libhttpd/libhttpd.json

@@ -1,27 +1,27 @@
 {
-	"Name": "libhttpd",
-	"Library": "libhttpd.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"alloc.c",
-	"checkcontent.c",
-	"date.c",
-	"fail.c",
-	"gethead.c",
-	"hio.c",
-	"httpfmt.c",
-	"httpunesc.c",
-	"lower.c",
-	"okheaders.c",
-	"parse.c",
-	"parsereq.c",
-	"query.c",
-	"redirected.c",
-	"unallowed.c",
-	"urlfmt.c",
-	"urlunesc.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libhttpd.a",
+	"Name": "libhttpd",
+	"SourceFiles": [
+		"alloc.c",
+		"checkcontent.c",
+		"date.c",
+		"fail.c",
+		"gethead.c",
+		"hio.c",
+		"httpfmt.c",
+		"httpunesc.c",
+		"lower.c",
+		"okheaders.c",
+		"parse.c",
+		"parsereq.c",
+		"query.c",
+		"redirected.c",
+		"unallowed.c",
+		"urlfmt.c",
+		"urlunesc.c"
+	]
 }

sys/src/libip/klibip.json

@@ -1,21 +1,21 @@
 {
-	"Name": "KernelLibip",
-	"Library": "klibip.a",
-	"Include": ["../klib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"eipfmt.c",
-	"equivip.c",
-	"parseip.c",
-	"parseether.c",
-	"myetheraddr.c",
-	"myipaddr.c",
-	"classmask.c",
-	"bo.c",
-	"readipifc.c",
-	"ipaux.c",
-	"ptclbsum.c"
+	"Include": [
+		"../klib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "klibip.a",
+	"Name": "KernelLibip",
+	"SourceFiles": [
+		"eipfmt.c",
+		"equivip.c",
+		"parseip.c",
+		"parseether.c",
+		"myetheraddr.c",
+		"myipaddr.c",
+		"classmask.c",
+		"bo.c",
+		"readipifc.c",
+		"ipaux.c",
+		"ptclbsum.c"
+	]
 }

sys/src/libip/libip.json

@@ -1,21 +1,21 @@
 {
-	"Name": "Libip",
-	"Library": "libip.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"eipfmt.c",
-	"equivip.c",
-	"parseip.c",
-	"parseether.c",
-	"myetheraddr.c",
-	"myipaddr.c",
-	"classmask.c",
-	"bo.c",
-	"readipifc.c",
-	"ipaux.c",
-	"ptclbsum.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libip.a",
+	"Name": "Libip",
+	"SourceFiles": [
+		"eipfmt.c",
+		"equivip.c",
+		"parseip.c",
+		"parseether.c",
+		"myetheraddr.c",
+		"myipaddr.c",
+		"classmask.c",
+		"bo.c",
+		"readipifc.c",
+		"ipaux.c",
+		"ptclbsum.c"
+	]
 }

sys/src/liblex/liblex.json

@@ -1,15 +1,15 @@
 {
-	"Name": "liblex",
-	"Library": "liblex.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"allprint.c",
-	"main.c",
-	"reject.c",
-	"yyless.c",
-	"yywrap.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "liblex.a",
+	"Name": "liblex",
+	"SourceFiles": [
+		"allprint.c",
+		"main.c",
+		"reject.c",
+		"yyless.c",
+		"yywrap.c"
+	]
 }

sys/src/libmach/libmach.json

@@ -1,21 +1,21 @@
 {
-	"Name": "libmach",
-	"Library": "libmach.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"6.c",
-	"6obj.c",
-	"8db.c",
-	"access.c",
-	"executable.c",
-	"machdata.c",
-	"map.c",
-	"obj.c",
-	"setmach.c",
-	"swap.c",
-	"sym.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libmach.a",
+	"Name": "libmach",
+	"SourceFiles": [
+		"6.c",
+		"6obj.c",
+		"8db.c",
+		"access.c",
+		"executable.c",
+		"machdata.c",
+		"map.c",
+		"obj.c",
+		"setmach.c",
+		"swap.c",
+		"sym.c"
+	]
 }

sys/src/libmemdraw/libmemdraw.json

@@ -1,30 +1,30 @@
 {
-	"Name": "libmemdraw",
-	"Library": "libmemdraw.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"alloc.c",
-	"arc.c",
-	"cload.c",
-	"cmap.c",
-	"cread.c",
-	"defont.c",
-	"draw.c",
-	"ellipse.c",
-	"fillpoly.c",
-	"hwdraw.c",
-	"iprint.c",
-	"line.c",
-	"load.c",
-	"openmemsubfont.c",
-	"poly.c",
-	"read.c",
-	"string.c",
-	"subfont.c",
-	"unload.c",
-	"write.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libmemdraw.a",
+	"Name": "libmemdraw",
+	"SourceFiles": [
+		"alloc.c",
+		"arc.c",
+		"cload.c",
+		"cmap.c",
+		"cread.c",
+		"defont.c",
+		"draw.c",
+		"ellipse.c",
+		"fillpoly.c",
+		"hwdraw.c",
+		"iprint.c",
+		"line.c",
+		"load.c",
+		"openmemsubfont.c",
+		"poly.c",
+		"read.c",
+		"string.c",
+		"subfont.c",
+		"unload.c",
+		"write.c"
+	]
 }

sys/src/libmemlayer/libmemlayer.json

@@ -1,22 +1,22 @@
 {
-	"Name": "libmemlayer",
-	"Library": "libmemlayer.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"draw.c",
-	"lalloc.c",
-	"layerop.c",
-	"ldelete.c",
-	"lhide.c",
-	"line.c",
-	"load.c",
-	"lorigin.c",
-	"lsetrefresh.c",
-	"ltofront.c",
-	"ltorear.c",
-	"unload.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libmemlayer.a",
+	"Name": "libmemlayer",
+	"SourceFiles": [
+		"draw.c",
+		"lalloc.c",
+		"layerop.c",
+		"ldelete.c",
+		"lhide.c",
+		"line.c",
+		"load.c",
+		"lorigin.c",
+		"lsetrefresh.c",
+		"ltofront.c",
+		"ltorear.c",
+		"unload.c"
+	]
 }

sys/src/libmp/libmp.json

@@ -1,42 +1,42 @@
 {
-	"Name": "libmp",
-	"Library": "libmp.a",
-	"Include": ["../lib.json"],
-	"Pre": [
-	],
-    "SourceFiles": [
-	"port/betomp.c",
-	"port/crt.c",
-	"port/crttest.c",
-	"port/letomp.c",
-	"port/mpadd.c",
-	"port/mpaux.c",
-	"port/mpcmp.c",
-	"port/mpdigdiv.c",
-	"port/mpdiv.c",
-	"port/mpeuclid.c",
-	"port/mpexp.c",
-	"port/mpextendedgcd.c",
-	"port/mpfactorial.c",
-	"port/mpfmt.c",
-	"port/mpinvert.c",
-	"port/mpleft.c",
-	"port/mpmod.c",
-	"port/mpmul.c",
-	"port/mprand.c",
-	"port/mpright.c",
-	"port/mpsub.c",
-	"port/mptobe.c",
-	"port/mptoi.c",
-	"port/mptole.c",
-	"port/mptoui.c",
-	"port/mptouv.c",
-	"port/mptov.c",
-	"port/mpvecadd.c",
-	"port/mpveccmp.c",
-	"port/mpvecdigmuladd.c",
-	"port/mpvecsub.c",
-	"port/strtomp.c"
+	"Include": [
+		"../lib.json"
 	],
-	"Install": "/$ARCH/lib/"
+	"Install": "/$ARCH/lib/",
+	"Library": "libmp.a",
+	"Name": "libmp",
+	"SourceFiles": [
+		"port/betomp.c",
+		"port/crt.c",
+		"port/crttest.c",
+		"port/letomp.c",
+		"port/mpadd.c",
+		"port/mpaux.c",
+		"port/mpcmp.c",
+		"port/mpdigdiv.c",
+		"port/mpdiv.c",
+		"port/mpeuclid.c",
+		"port/mpexp.c",
+		"port/mpextendedgcd.c",
+		"port/mpfactorial.c",
+		"port/mpfmt.c",
+		"port/mpinvert.c",
+		"port/mpleft.c",
+		"port/mpmod.c",
+		"port/mpmul.c",
+		"port/mprand.c",
+		"port/mpright.c",
+		"port/mpsub.c",
+		"port/mptobe.c",
+		"port/mptoi.c",
+		"port/mptole.c",
+		"port/mptoui.c",
+		"port/mptouv.c",
+		"port/mptov.c",
+		"port/mpvecadd.c",
+		"port/mpveccmp.c",
+		"port/mpvecdigmuladd.c",
+		"port/mpvecsub.c",
+		"port/strtomp.c"
+	]
 }