From 39c9a8bd5a278873e8ca00b0f50e2494a60deb26 Mon Sep 17 00:00:00 2001
From: Josh Haberman <jhaberman@gmail.com>
Date: Wed, 3 Dec 2014 14:18:28 -0800
Subject: Sync from Google-internal development.

Most notably, a JSON parser is now provided.
---
 Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e1c6f67..dcff210 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@
 # Prevents the deletion of intermediate files.
 .SECONDARY:
 
-UPB_MODULES = upb upb.pb upb.descriptor
+UPB_MODULES = upb upb.pb upb.json upb.descriptor
 UPB_LIBS = $(patsubst %,lib/lib%.a,$(UPB_MODULES))
 UPB_PICLIBS = $(patsubst %,lib/lib%_pic.a,$(UPB_MODULES))
 
@@ -155,7 +155,14 @@ upb/pb/compile_decoder_x64.h: upb/pb/compile_decoder_x64.dasc
 endif
 
 upb_json_SRCS = \
-  upb/json/typed_printer.c
+  upb/json/parser.c \
+
+  # disabled until we move off YAJL (which should be soon).
+  #upb/json/printer.c \
+
+upb/json/parser.c: upb/json/parser.rl
+	$(E) RAGEL $<
+	$(Q) ragel -C -o upb/json/parser.c upb/json/parser.rl
 
 # If the user doesn't specify an -O setting, we use -O3 for critical-path
 # code and -Os for the rest.
-- 
cgit v1.2.3