diff options
| author | Josh Haberman <jhaberman@gmail.com> | 2014-12-03 14:18:28 -0800 |
|---|---|---|
| committer | Josh Haberman <jhaberman@gmail.com> | 2014-12-03 14:19:59 -0800 |
| commit | 39c9a8bd5a278873e8ca00b0f50e2494a60deb26 (patch) | |
| tree | 336ed01c8b25407151861a21efb53bc6ea83fb53 /Makefile | |
| parent | 177212c82f62e86e67bca69d1dbcf9d39d9123c4 (diff) | |
Sync from Google-internal development.
Most notably, a JSON parser is now provided.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -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. |