summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBurnZeZ <brz-9dev@intma.in>2013-10-27 15:44:33 -0400
committerBurnZeZ <brz-9dev@intma.in>2013-10-27 15:44:33 -0400
commit2dc7e311f43c41ecc412c237cbcb6293953c17e9 (patch)
treec78a94a222c4eabf97db33d83061df7625897afd
parent632b7adffbd137d9cbe95431fa6919f875c47e5b (diff)
make libjson from /sys/src/cmd/btc/json.c
-rw-r--r--sys/include/json.h (renamed from sys/src/cmd/btc/json.h)3
-rw-r--r--sys/src/cmd/btc/httpfs.c2
-rw-r--r--sys/src/cmd/btc/mkfile3
-rw-r--r--sys/src/libjson/json.c (renamed from sys/src/cmd/btc/json.c)2
-rw-r--r--sys/src/libjson/mkfile10
-rw-r--r--sys/src/mkfile1
6 files changed, 16 insertions, 5 deletions
diff --git a/sys/src/cmd/btc/json.h b/sys/include/json.h
index 75b2a8ea7..9544a1e65 100644
--- a/sys/src/cmd/btc/json.h
+++ b/sys/include/json.h
@@ -1,3 +1,6 @@
+#pragma src "/sys/src/libjson"
+#pragma lib "libjson.a"
+
typedef struct JSONEl JSONEl;
typedef struct JSON JSON;
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/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\