make libjson from /sys/src/cmd/btc/json.c

6 files changed, 13 insertions, 37 deletions

diff --git a/sys/src/cmd/btc/httpfs.c b/sys/src/cmd/btc/httpfs.c
index c29a39e31..861ddde3e 100644
--- a/sys/src/cmd/btc/httpfs.c
+++ b/sys/src/cmd/btc/httpfs.c
@@ -4,8 +4,8 @@
 #include <thread.h>
 #include <9p.h>
 #include <String.h>
+#include <json.h>
 #include "dat.h"
-#include "json.h"
 
 void gofs(void);
 
diff --git a/sys/src/cmd/btc/json.h b/sys/src/cmd/btc/json.h
deleted file mode 100644
index 75b2a8ea7..000000000
--- a/sys/src/cmd/btc/json.h
+++ /dev/null
@@ -1,32 +0,0 @@
-typedef struct JSONEl JSONEl;
-typedef struct JSON JSON;
-
-enum {
-	JSONNull,
-	JSONBool,
-	JSONNumber,
-	JSONString,
-	JSONArray,
-	JSONObject,
-};
-
-struct JSONEl {
-	char *name;
-	JSON *val;
-	JSONEl *next;
-};
-
-struct JSON
-{
-	int t;
-	union {
-		double n;
-		char *s;
-		JSONEl *first;
-	};
-};
-
-JSON*	jsonparse(char *);
-void	jsonfree(JSON *);
-JSON*	jsonbyname(JSON *, char *);
-char*	jsonstr(JSON *);
diff --git a/sys/src/cmd/btc/mkfile b/sys/src/cmd/btc/mkfile
index c30cd7690..7d130ce1a 100644
--- a/sys/src/cmd/btc/mkfile
+++ b/sys/src/cmd/btc/mkfile
@@ -4,9 +4,6 @@ TARG=httpfs sign genkey
 
 BIN=/$objtype/bin/btc
 
-OFILES=\
-	json.$O\
-
 HFILES=\
 	dat.h\
 
diff --git a/sys/src/cmd/btc/json.c b/sys/src/libjson/json.c
index 988a7d751..850b94af7 100644
--- a/sys/src/cmd/btc/json.c
+++ b/sys/src/libjson/json.c
@@ -1,7 +1,7 @@
 #include <u.h>
 #include <libc.h>
 #include <ctype.h>
-#include "json.h"
+#include <json.h>
 
 typedef struct Lex Lex;
 
diff --git a/sys/src/libjson/mkfile b/sys/src/libjson/mkfile
new file mode 100644
index 000000000..3b61d9c89
--- /dev/null
+++ b/sys/src/libjson/mkfile
@@ -0,0 +1,10 @@
+</$objtype/mkfile
+
+LIB=/$objtype/lib/libjson.a
+OFILES=\
+	json.$O
+
+HFILES=\
+	/sys/include/json.h
+
+</sys/src/cmd/mksyslib
diff --git a/sys/src/mkfile b/sys/src/mkfile
index 13af22e29..d5d271de4 100644
--- a/sys/src/mkfile
+++ b/sys/src/mkfile
@@ -22,6 +22,7 @@ LIBS=\
 	libhttpd\
 	libip\
 	liblex\
+	libjson\
 	libmach\
 	libmemdraw\
 	libmemlayer\