Clean up the json files

We had Cflags all over the place. Now they are mostly in one place. This is from
running preen.

Change-Id: I94f1074e3cdbe7f49e003a39b40a565bbef1e5e6
Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>

amd64/include/cflags.json

@@ -0,0 +1,17 @@
+{
+	"Name": "buildflags",
+	"Cflags": [
+		"-g",
+		"-Wall",
+		"-Wno-missing-braces",
+		"-Wno-parentheses",
+		"-Wno-unknown-pragmas",
+		"-O0",
+		"-static",
+		"-fplan9-extensions",
+		"-mno-red-zone",
+		"-ffreestanding",
+		"-fno-builtin",
+		"-mcmodel=small"
+	]
+}

sys/src/cmd/cmd.json

@@ -1,19 +1,6 @@
 {
-	"Cflags": [
-		"-mcmodel=small",
-		"-O0",
-		"-fplan9-extensions",
-		"-mno-red-zone",
-		"-ffreestanding",
-		"-fno-builtin",
-		"-trigraphs",
-		"-Wall",
-		"-Wno-missing-braces",
-		"-Wno-parentheses",
-		"-Wno-unknown-pragmas",
-		"-Wuninitialized",
-		"-Wmaybe-uninitialized",
-		"-g"
+	"Include": [
+		"/amd64/include/cflags.json"
 	],
 	"Name": "Cmd",
 	"Oflags": [

sys/src/cmd/disk/kfs/kfs.json

@@ -2,8 +2,8 @@
 	"Include": [
 		"../../cmd.json"
 	],
-	"Name": "kfs",
 	"Install": "/$ARCH/bin/disk",
+	"Name": "kfs",
 	"Program": "kfs",
 	"SourceFiles": [
 		"9p1.c",
@@ -27,4 +27,3 @@
 		"devwren.c"
 	]
 }
-

sys/src/cmd/ip/dhcpd/dhcpd.json

@@ -11,4 +11,4 @@
 		"ndb.c",
 		"ping.c"
 	]
-}
+}

sys/src/cmd/ip/dhcpd/dhcpleases.json

@@ -10,4 +10,4 @@
 		"db.c",
 		"ping.c"
 	]
-}
+}

sys/src/cmd/ip/ftpd.json

@@ -9,4 +9,4 @@
 		"ftpd.c",
 		"glob.c"
 	]
-}
+}

sys/src/cmd/ip/ftpfs/ftpfs.json

@@ -10,4 +10,4 @@
 		"proto.c",
 		"file.c"
 	]
-}
+}

sys/src/cmd/ip/httpd/httpd.json

@@ -2,11 +2,14 @@
 	"Include": [
 		"/sys/src/cmd/cmd.json"
 	],
+	"Install": "/$ARCH/bin/ip",
+	"Name": "httpdcmds",
+	"Oflags": [
+		"libhttps.a"
+	],
 	"Projects": [
 		"libhttps.json"
 	],
-	"Install": "/$ARCH/bin/ip",
-	"Name": "httpdcmds",
 	"SourceFilesCmd": [
 		"httpd.c",
 		"imagemap.c",
@@ -16,8 +19,5 @@
 		"netlib_history.c",
 		"webls.c",
 		"wikipost.c"
-	],
-	"Oflags": [
-		"libhttps.a"
 	]
 }

sys/src/cmd/ip/imap4d/imap4d.json

@@ -23,4 +23,4 @@
 		"utils.c",
 		"debug.c"
 	]
-}
+}

sys/src/cmd/ip/ip.json

@@ -4,6 +4,16 @@
 	],
 	"Install": "/$ARCH/bin/ip",
 	"Name": "ipcmds",
+	"Projects": [
+		"ftpd.json",
+		"dhcpd/dhcpd.json",
+		"dhcpd/dhcpleases.json",
+		"ftpfs/ftpfs.json",
+		"httpd/httpd.json",
+		"imap4d/imap4d.json",
+		"ipconfig/ipconfig.json",
+		"ppp/ppp.json"
+	],
 	"SourceFilesCmd": [
 		"ping.c",
 		"dhcpclient.c",
@@ -24,15 +34,5 @@
 		"traceroute.c",
 		"udpecho.c",
 		"wol.c"
-	],
-	"Projects": [
-		"ftpd.json",
-		"dhcpd/dhcpd.json",
-		"dhcpd/dhcpleases.json",
-		"ftpfs/ftpfs.json",
-		"httpd/httpd.json",
-		"imap4d/imap4d.json",
-		"ipconfig/ipconfig.json",
-		"ppp/ppp.json"
 	]
 }

sys/src/lib.json

@@ -1,17 +1,6 @@
 {
-	"Cflags": [
-		"-O0",
-		"-fplan9-extensions",
-		"-mno-red-zone",
-		"-ffreestanding",
-		"-fno-builtin",
-		"-Wall",
-		"-Wno-missing-braces",
-		"-Wno-parentheses",
-		"-Wno-unknown-pragmas",
-		"-Wuninitialized",
-		"-Wmaybe-uninitialized",
-		"-g"
+	"Include": [
+		"/amd64/include/cflags.json"
 	],
 	"Name": "Libs",
 	"Oflags": [

sys/src/libthread/libthread.json

@@ -1,8 +1,8 @@
 {
 	"Include": [
+		"/amd64/include/cflags.json",
 		"../lib.json"
 	],
-	"Cflags": [ "-Werror" ],
 	"Install": "/$ARCH/lib/",
 	"Library": "libthread.a",
 	"Name": "libthread",

sys/src/sysconf.json

@@ -276,10 +276,10 @@
 		},
 		{
 			"#Id": 24,
-			"Id": 4120,
 			"Args": [
 				"void*"
 			],
+			"Id": 4120,
 			"Name": "brk_",
 			"Ret": [
 				"void*"