From 2dc7e311f43c41ecc412c237cbcb6293953c17e9 Mon Sep 17 00:00:00 2001 From: BurnZeZ Date: Sun, 27 Oct 2013 15:44:33 -0400 Subject: [PATCH] make libjson from /sys/src/cmd/btc/json.c --- sys/{src/cmd/btc => include}/json.h | 3 +++ sys/src/cmd/btc/httpfs.c | 2 +- sys/src/cmd/btc/mkfile | 3 --- sys/src/{cmd/btc => libjson}/json.c | 2 +- sys/src/libjson/mkfile | 10 ++++++++++ sys/src/mkfile | 1 + 6 files changed, 16 insertions(+), 5 deletions(-) rename sys/{src/cmd/btc => include}/json.h (87%) rename sys/src/{cmd/btc => libjson}/json.c (99%) create mode 100644 sys/src/libjson/mkfile diff --git a/sys/src/cmd/btc/json.h b/sys/include/json.h similarity index 87% rename from sys/src/cmd/btc/json.h rename to 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 #include <9p.h> #include +#include #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 similarity index 99% rename from sys/src/cmd/btc/json.c rename to 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 #include #include -#include "json.h" +#include 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 @@ +