summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoshua Haberman <jhaberman@gmail.com>2014-12-04 17:02:53 -0800
committerJoshua Haberman <jhaberman@gmail.com>2014-12-04 17:02:53 -0800
commita350b4206978f5924f17135c8177d0ea9e295edb (patch)
tree1e20ee0250ec22f824f72ac254d74508774b5250 /Makefile
parent39c9a8bd5a278873e8ca00b0f50e2494a60deb26 (diff)
parentdb63db82aaa6374cf737cfd233309856e7446b40 (diff)
Merge pull request #5 from cfallin/master
JSON printer: remove dependency on YAJL, using a hand-rolled printer instead.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 1 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index dcff210..b2c4036 100644
--- a/Makefile
+++ b/Makefile
@@ -156,9 +156,7 @@ endif
upb_json_SRCS = \
upb/json/parser.c \
-
- # disabled until we move off YAJL (which should be soon).
- #upb/json/printer.c \
+ upb/json/printer.c \
upb/json/parser.c: upb/json/parser.rl
$(E) RAGEL $<
generated by cgit on debian on lair
contact matthew@masot.net with questions or feedback