diff options
author | Josh Haberman <jhaberman@gmail.com> | 2014-01-21 18:38:49 -0800 |
---|---|---|
committer | Josh Haberman <jhaberman@gmail.com> | 2014-01-21 18:38:49 -0800 |
commit | 0fd2f830882402979a83010e89650e7245960d39 (patch) | |
tree | 0968ca9424c5fb2433047519cbd54d3dd8d0b863 /Makefile | |
parent | ce9bba3cb5409844f8f3d7dcc235a9ea30cad090 (diff) |
Sync to internal Google development.
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 9 |
1 files changed, 3 insertions, 6 deletions
@@ -82,16 +82,14 @@ deps: Makefile $(ALLSRC) # The core library. CORE= \ - upb/bytestream.upb.c \ upb/def.c \ upb/descriptor/reader.c \ upb/descriptor/descriptor.upb.c \ - upb/google/bridge.cc \ - upb/google/proto2.cc \ + upb/bindings/googlepb/bridge.cc \ + upb/bindings/googlepb/proto2.cc \ upb/handlers.c \ upb/refcounted.c \ upb/shim/shim.c \ - upb/sink.c \ upb/symtab.c \ upb/table.c \ upb/upb.c \ @@ -217,8 +215,7 @@ tests/test.proto.pb: tests/test.proto SIMPLE_TESTS= \ tests/test_def \ - tests/test_varint \ - tests/test_pipeline \ + tests/pb/test_varint \ tests/test_handlers SIMPLE_CXX_TESTS= \ |