diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-06-24 08:48:14 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-06-24 08:48:14 -0700 |
| commit | d13794332c13737f978b8b4fd56c82ea90c3c2ba (patch) | |
| tree | 10380b60055fa4773141161d6527d06e64561fdb /Makefile | |
| parent | 98bf7e6517aa6977a1d7be459143c13e28eb5e3c (diff) | |
| parent | 85bc52e38a5d2b89e66850d83c91c9c1d4969091 (diff) | |
Merge github.com:grpc/grpc into oops-i-split-it-again
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
@@ -3410,7 +3410,6 @@ LIBGRPC++_SRC = \ src/cpp/client/channel.cc \ src/cpp/client/channel_arguments.cc \ src/cpp/client/client_context.cc \ - src/cpp/client/client_unary_call.cc \ src/cpp/client/create_channel.cc \ src/cpp/client/credentials.cc \ src/cpp/client/generic_stub.cc \ @@ -3442,6 +3441,7 @@ PUBLIC_HEADERS_CXX += \ include/grpc++/client_context.h \ include/grpc++/completion_queue.h \ include/grpc++/config.h \ + include/grpc++/config_protobuf.h \ include/grpc++/create_channel.h \ include/grpc++/credentials.h \ include/grpc++/generic_stub.h \ @@ -3449,8 +3449,10 @@ PUBLIC_HEADERS_CXX += \ include/grpc++/impl/client_unary_call.h \ include/grpc++/impl/grpc_library.h \ include/grpc++/impl/internal_stub.h \ + include/grpc++/impl/proto_utils.h \ include/grpc++/impl/rpc_method.h \ include/grpc++/impl/rpc_service_method.h \ + include/grpc++/impl/serialization_traits.h \ include/grpc++/impl/service_type.h \ include/grpc++/impl/sync.h \ include/grpc++/impl/sync_cxx11.h \ @@ -3698,7 +3700,6 @@ LIBGRPC++_UNSECURE_SRC = \ src/cpp/client/channel.cc \ src/cpp/client/channel_arguments.cc \ src/cpp/client/client_context.cc \ - src/cpp/client/client_unary_call.cc \ src/cpp/client/create_channel.cc \ src/cpp/client/credentials.cc \ src/cpp/client/generic_stub.cc \ @@ -3730,6 +3731,7 @@ PUBLIC_HEADERS_CXX += \ include/grpc++/client_context.h \ include/grpc++/completion_queue.h \ include/grpc++/config.h \ + include/grpc++/config_protobuf.h \ include/grpc++/create_channel.h \ include/grpc++/credentials.h \ include/grpc++/generic_stub.h \ @@ -3737,8 +3739,10 @@ PUBLIC_HEADERS_CXX += \ include/grpc++/impl/client_unary_call.h \ include/grpc++/impl/grpc_library.h \ include/grpc++/impl/internal_stub.h \ + include/grpc++/impl/proto_utils.h \ include/grpc++/impl/rpc_method.h \ include/grpc++/impl/rpc_service_method.h \ + include/grpc++/impl/serialization_traits.h \ include/grpc++/impl/service_type.h \ include/grpc++/impl/sync.h \ include/grpc++/impl/sync_cxx11.h \ |