diff options
| author |  yang-g <yangg@google.com> | 2015-08-05 09:27:39 -0700 |
|---|---|---|
| committer | yang-g <yangg@google.com> | 2015-08-05 09:27:39 -0700 |
| commit | 38ed056304503b5a042d7145563fad7d509935a2 (patch) | |
| tree | 9cfd5d1844486f44b1fcb2a8020732a6fb6e6f51 /Makefile | |
| parent | 297a25b0cf22bdc3a77f748c0d785095fa1fae1d (diff) | |
| parent | 3bbacf1b5ece50a8f9a945c88e2f81d3f8594e47 (diff) | |
Merge remote-tracking branch 'upstream/master' into stuboptions
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 38 |
1 files changed, 38 insertions, 0 deletions
@@ -18682,6 +18682,8 @@ ifneq ($(OPENSSL_DEP),) # This is to ensure the embedded OpenSSL is built beforehand, properly # installing headers to their final destination on the drive. We need this # otherwise parallel compilation will fail if a source is compiled first. +examples/pubsub/publisher.cc: $(OPENSSL_DEP) +examples/pubsub/subscriber.cc: $(OPENSSL_DEP) src/core/httpcli/format_request.c: $(OPENSSL_DEP) src/core/httpcli/httpcli.c: $(OPENSSL_DEP) src/core/httpcli/httpcli_security_connector.c: $(OPENSSL_DEP) @@ -18706,6 +18708,42 @@ src/core/surface/secure_channel_create.c: $(OPENSSL_DEP) src/core/tsi/fake_transport_security.c: $(OPENSSL_DEP) src/core/tsi/ssl_transport_security.c: $(OPENSSL_DEP) src/core/tsi/transport_security.c: $(OPENSSL_DEP) +src/cpp/client/secure_channel_arguments.cc: $(OPENSSL_DEP) +src/cpp/client/secure_credentials.cc: $(OPENSSL_DEP) +src/cpp/common/auth_property_iterator.cc: $(OPENSSL_DEP) +src/cpp/common/secure_auth_context.cc: $(OPENSSL_DEP) +src/cpp/common/secure_create_auth_context.cc: $(OPENSSL_DEP) +src/cpp/server/secure_server_credentials.cc: $(OPENSSL_DEP) +src/csharp/ext/grpc_csharp_ext.c: $(OPENSSL_DEP) +test/core/bad_client/bad_client.c: $(OPENSSL_DEP) +test/core/end2end/data/server1_cert.c: $(OPENSSL_DEP) +test/core/end2end/data/server1_key.c: $(OPENSSL_DEP) +test/core/end2end/data/test_root_cert.c: $(OPENSSL_DEP) +test/core/end2end/fixtures/chttp2_fake_security.c: $(OPENSSL_DEP) +test/core/end2end/fixtures/chttp2_simple_ssl_fullstack.c: $(OPENSSL_DEP) +test/core/end2end/fixtures/chttp2_simple_ssl_fullstack_with_poll.c: $(OPENSSL_DEP) +test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.c: $(OPENSSL_DEP) +test/core/end2end/tests/request_response_with_payload_and_call_creds.c: $(OPENSSL_DEP) +test/cpp/interop/client.cc: $(OPENSSL_DEP) +test/cpp/interop/client_helper.cc: $(OPENSSL_DEP) +test/cpp/interop/interop_client.cc: $(OPENSSL_DEP) +test/cpp/interop/server.cc: $(OPENSSL_DEP) +test/cpp/interop/server_helper.cc: $(OPENSSL_DEP) +test/cpp/qps/client_async.cc: $(OPENSSL_DEP) +test/cpp/qps/client_sync.cc: $(OPENSSL_DEP) +test/cpp/qps/driver.cc: $(OPENSSL_DEP) +test/cpp/qps/perf_db_client.cc: $(OPENSSL_DEP) +test/cpp/qps/qps_worker.cc: $(OPENSSL_DEP) +test/cpp/qps/report.cc: $(OPENSSL_DEP) +test/cpp/qps/server_async.cc: $(OPENSSL_DEP) +test/cpp/qps/server_sync.cc: $(OPENSSL_DEP) +test/cpp/qps/timer.cc: $(OPENSSL_DEP) +test/cpp/util/benchmark_config.cc: $(OPENSSL_DEP) +test/cpp/util/cli_call.cc: $(OPENSSL_DEP) +test/cpp/util/create_test_channel.cc: $(OPENSSL_DEP) +test/cpp/util/fake_credentials.cc: $(OPENSSL_DEP) +test/cpp/util/subprocess.cc: $(OPENSSL_DEP) +test/cpp/util/test_config.cc: $(OPENSSL_DEP) endif .PHONY: all strip tools dep_error openssl_dep_error openssl_dep_message git_update stop buildtests buildtests_c buildtests_cxx test test_c test_cxx install install_c install_cxx install-headers install-headers_c install-headers_cxx install-shared install-shared_c install-shared_cxx install-static install-static_c install-static_cxx strip strip-shared strip-static strip_c strip-shared_c strip-static_c strip_cxx strip-shared_cxx strip-static_cxx dep_c dep_cxx bins_dep_c bins_dep_cxx clean |