diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2015-06-22 15:37:59 -0700 |
|---|---|---|
| committer | Joshua Haberman <jhaberman@gmail.com> | 2015-06-22 15:37:59 -0700 |
| commit | ff8b042ad310f105249eeab761427669d6fe9766 (patch) | |
| tree | daeed7a7201ca0440a0b34f66ee0525369ccf113 /Makefile | |
| parent | d264438d15a8f5a6b539ce38f8ea125ab5f1dd98 (diff) | |
| parent | c3e9a57a6fff08640f3ad05e8df971d5ddb37d51 (diff) | |
Merge pull request #30 from haberman/encoderfix
Fixed some bad bugs in upb_env.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -289,6 +289,7 @@ C_TESTS = \ CC_TESTS = \ tests/pb/test_decoder \ + tests/pb/test_encoder \ tests/json/test_json \ tests/test_cpp \ tests/test_table \ @@ -317,12 +318,11 @@ tests/pb/test_varint: LIBS = lib/libupb.pb.a lib/libupb.a $(EXTRA_LIBS) tests/test_def: LIBS = $(LOAD_DESCRIPTOR_LIBS) lib/libupb.a $(EXTRA_LIBS) tests/test_handlers: LIBS = lib/libupb.descriptor.a lib/libupb.a $(EXTRA_LIBS) tests/pb/test_decoder: LIBS = lib/libupb.pb.a lib/libupb.a $(EXTRA_LIBS) +tests/pb/test_encoder: LIBS = lib/libupb.pb.a lib/libupb.descriptor.a lib/libupb.a $(EXTRA_LIBS) tests/test_cpp: LIBS = $(LOAD_DESCRIPTOR_LIBS) lib/libupb.a $(EXTRA_LIBS) tests/test_table: LIBS = lib/libupb.a $(EXTRA_LIBS) tests/json/test_json: LIBS = lib/libupb.a lib/libupb.json.a $(EXTRA_LIBS) -tests/test_def: tests/test.proto.pb - tests/test.proto.pb: tests/test.proto @# TODO: add .proto file parser to upb so this isn't necessary. protoc tests/test.proto -otests/test.proto.pb |