diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2014-12-09 14:05:41 -0800 |
---|---|---|
committer | Joshua Haberman <jhaberman@gmail.com> | 2014-12-09 14:05:41 -0800 |
commit | bf51ef86b448138a281e796df5bdfa8fa118524d (patch) | |
tree | ce16586d7f0a8e5c87252727b4b3745d1a48a4eb /Makefile | |
parent | e257bd978d5e6278e7b188d543858852c0c4d856 (diff) | |
parent | 8f8113b4fff748b57b0ff2f1a301e86b4703be84 (diff) |
Merge pull request #7 from cfallin/master
JSON test, symbolic enum names in JSON, and a few improvements.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -235,6 +235,7 @@ C_TESTS = \ CC_TESTS = \ tests/pb/test_decoder \ + tests/json/test_json \ tests/test_cpp \ tests/test_table \ @@ -264,6 +265,7 @@ tests/test_handlers: LIBS = lib/libupb.descriptor.a lib/libupb.a tests/pb/test_decoder: LIBS = lib/libupb.pb.a lib/libupb.a tests/test_cpp: LIBS = $(LOAD_DESCRIPTOR_LIBS) lib/libupb.a tests/test_table: LIBS = lib/libupb.a +tests/json/test_json: LIBS = lib/libupb.a lib/libupb.json.a tests/test_def: tests/test.proto.pb |