From 27a0dc0208e90b6463049df16da6c35216eab0aa Mon Sep 17 00:00:00 2001
From: "Nicolas \"Pixel\" Noble" <pixel@nobis-crew.org>
Date: Sat, 11 Apr 2015 01:25:22 +0200
Subject: Adjusting build.json.

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 903e497b77..929452b084 100644
--- a/Makefile
+++ b/Makefile
@@ -3283,6 +3283,7 @@ PUBLIC_HEADERS_CXX += \
     include/grpc++/status_code_enum.h \
     include/grpc++/stream.h \
     include/grpc++/thread_pool_interface.h \
+    include/grpc++/time.h \
 
 LIBGRPC++_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_SRC))))
 
@@ -3534,6 +3535,7 @@ PUBLIC_HEADERS_CXX += \
     include/grpc++/status_code_enum.h \
     include/grpc++/stream.h \
     include/grpc++/thread_pool_interface.h \
+    include/grpc++/time.h \
 
 LIBGRPC++_UNSECURE_OBJS = $(addprefix $(OBJDIR)/$(CONFIG)/, $(addsuffix .o, $(basename $(LIBGRPC++_UNSECURE_SRC))))
 
-- 
cgit v1.2.3


From 96de48449ccc6009bc745ab5ff35837a4720fdd1 Mon Sep 17 00:00:00 2001
From: Yang Gao <yangg@google.com>
Date: Fri, 24 Apr 2015 13:13:12 -0700
Subject: Add the new header to build.json and regenerate projects

---
 BUILD                                    | 2 ++
 Makefile                                 | 2 ++
 build.json                               | 1 +
 vsprojects/grpc++/grpc++.vcxproj         | 1 +
 vsprojects/grpc++/grpc++.vcxproj.filters | 3 +++
 5 files changed, 9 insertions(+)

(limited to 'Makefile')

diff --git a/BUILD b/BUILD
index 2a93161db2..79070f1c1e 100644
--- a/BUILD
+++ b/BUILD
@@ -621,6 +621,7 @@ cc_library(
     "include/grpc++/generic_stub.h",
     "include/grpc++/impl/call.h",
     "include/grpc++/impl/client_unary_call.h",
+    "include/grpc++/impl/grpc_library.h",
     "include/grpc++/impl/internal_stub.h",
     "include/grpc++/impl/rpc_method.h",
     "include/grpc++/impl/rpc_service_method.h",
@@ -699,6 +700,7 @@ cc_library(
     "include/grpc++/generic_stub.h",
     "include/grpc++/impl/call.h",
     "include/grpc++/impl/client_unary_call.h",
+    "include/grpc++/impl/grpc_library.h",
     "include/grpc++/impl/internal_stub.h",
     "include/grpc++/impl/rpc_method.h",
     "include/grpc++/impl/rpc_service_method.h",
diff --git a/Makefile b/Makefile
index 3e7930b9c3..8cd71600ad 100644
--- a/Makefile
+++ b/Makefile
@@ -3854,6 +3854,7 @@ PUBLIC_HEADERS_CXX += \
     include/grpc++/generic_stub.h \
     include/grpc++/impl/call.h \
     include/grpc++/impl/client_unary_call.h \
+    include/grpc++/impl/grpc_library.h \
     include/grpc++/impl/internal_stub.h \
     include/grpc++/impl/rpc_method.h \
     include/grpc++/impl/rpc_service_method.h \
@@ -4117,6 +4118,7 @@ PUBLIC_HEADERS_CXX += \
     include/grpc++/generic_stub.h \
     include/grpc++/impl/call.h \
     include/grpc++/impl/client_unary_call.h \
+    include/grpc++/impl/grpc_library.h \
     include/grpc++/impl/internal_stub.h \
     include/grpc++/impl/rpc_method.h \
     include/grpc++/impl/rpc_service_method.h \
diff --git a/build.json b/build.json
index 8838d3a630..ec48314d26 100644
--- a/build.json
+++ b/build.json
@@ -28,6 +28,7 @@
         "include/grpc++/generic_stub.h",
         "include/grpc++/impl/call.h",
         "include/grpc++/impl/client_unary_call.h",
+        "include/grpc++/impl/grpc_library.h",
         "include/grpc++/impl/internal_stub.h",
         "include/grpc++/impl/rpc_method.h",
         "include/grpc++/impl/rpc_service_method.h",
diff --git a/vsprojects/grpc++/grpc++.vcxproj b/vsprojects/grpc++/grpc++.vcxproj
index 38eca1a14e..07c018f111 100644
--- a/vsprojects/grpc++/grpc++.vcxproj
+++ b/vsprojects/grpc++/grpc++.vcxproj
@@ -96,6 +96,7 @@
     <ClInclude Include="..\..\include\grpc++\generic_stub.h" />
     <ClInclude Include="..\..\include\grpc++\impl\call.h" />
     <ClInclude Include="..\..\include\grpc++\impl\client_unary_call.h" />
+    <ClInclude Include="..\..\include\grpc++\impl\grpc_library.h" />
     <ClInclude Include="..\..\include\grpc++\impl\internal_stub.h" />
     <ClInclude Include="..\..\include\grpc++\impl\rpc_method.h" />
     <ClInclude Include="..\..\include\grpc++\impl\rpc_service_method.h" />
diff --git a/vsprojects/grpc++/grpc++.vcxproj.filters b/vsprojects/grpc++/grpc++.vcxproj.filters
index 6466a0fa26..46b33bb8a6 100644
--- a/vsprojects/grpc++/grpc++.vcxproj.filters
+++ b/vsprojects/grpc++/grpc++.vcxproj.filters
@@ -120,6 +120,9 @@
     <ClInclude Include="..\..\include\grpc++\impl\client_unary_call.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\include\grpc++\impl\grpc_library.h">
+      <Filter>include\grpc++\impl</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\include\grpc++\impl\internal_stub.h">
       <Filter>include\grpc++\impl</Filter>
     </ClInclude>
-- 
cgit v1.2.3


From d896fa5640a7b43fd8bb289ff3fe5cd67fbf3bc1 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 24 Apr 2015 14:30:09 -0700
Subject: Remove some useless lines in the Makefile

---
 Makefile                    | 776 ++++++++++++++++++++++----------------------
 templates/Makefile.template |   2 +-
 2 files changed, 389 insertions(+), 389 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 3e7930b9c3..e8ab321ff7 100644
--- a/Makefile
+++ b/Makefile
@@ -3101,41 +3101,41 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGPR_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/src/core/support/alloc.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/cancellable.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/cmdline.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/cpu_iphone.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/cpu_linux.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/cpu_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/cpu_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/env_linux.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/env_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/env_win32.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/file.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/file_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/file_win32.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/histogram.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/host_port.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/log.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/log_android.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/log_linux.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/log_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/log_win32.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/murmur_hash.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/slice.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/slice_buffer.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/string.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/string_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/string_win32.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/sync.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/sync_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/sync_win32.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/thd.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/thd_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/thd_win32.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/time.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/time_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/support/time_win32.o: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 LIBGPR_TEST_UTIL_SRC = \
@@ -3160,7 +3160,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGPR_TEST_UTIL_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/util/test_config.o: 
+
 
 
 LIBGRPC_SRC = \
@@ -3351,123 +3351,123 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/src/core/httpcli/format_request.o: 
-$(OBJDIR)/$(CONFIG)/src/core/httpcli/httpcli.o: 
-$(OBJDIR)/$(CONFIG)/src/core/httpcli/httpcli_security_connector.o: 
-$(OBJDIR)/$(CONFIG)/src/core/httpcli/parser.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/auth.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/base64.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/credentials_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/credentials_win32.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/google_default_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/json_token.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/secure_endpoint.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/secure_transport_setup.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/security_connector.o: 
-$(OBJDIR)/$(CONFIG)/src/core/security/server_secure_chttp2.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/init_secure.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/secure_channel_create.o: 
-$(OBJDIR)/$(CONFIG)/src/core/tsi/fake_transport_security.o: 
-$(OBJDIR)/$(CONFIG)/src/core/tsi/ssl_transport_security.o: 
-$(OBJDIR)/$(CONFIG)/src/core/tsi/transport_security.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/call_op_string.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/census_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/channel_args.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/channel_stack.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/child_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/client_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/client_setup.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/connected_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/http_client_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/http_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/http_server_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/noop_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/compression/algorithm.o: 
-$(OBJDIR)/$(CONFIG)/src/core/compression/message_compress.o: 
-$(OBJDIR)/$(CONFIG)/src/core/debug/trace.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm_heap.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint_pair_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint_pair_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/fd_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iocp_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_kick.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_epoll.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_poll_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/resolve_address_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/resolve_address_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/sockaddr_utils.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_common_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_linux.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_client_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_client_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_server_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_server_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/time_averaged_stats.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_eventfd.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_nospecial.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_pipe.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json_reader.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json_string.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json_writer.o: 
-$(OBJDIR)/$(CONFIG)/src/core/profiling/timers.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_init.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_log.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_rpc_stats.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_tracing.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/hash_table.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/window_stats.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer_queue.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer_reader.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/call.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/call_details.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/call_log_batch.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/channel_create.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/client.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/completion_queue.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/event_string.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/init.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/lame_client.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/metadata_array.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/server.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/server_chttp2.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/server_create.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/surface_trace.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/alpn.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/bin_encoder.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_data.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_goaway.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_ping.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_rst_stream.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_settings.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_window_update.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/hpack_parser.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/hpack_table.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/huffsyms.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/status_conversion.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/stream_encoder.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/stream_map.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/timeout_encoding.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/varint.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2_transport.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/metadata.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/stream_op.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/transport.o: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 LIBGRPC_TEST_UTIL_SRC = \
@@ -3517,17 +3517,17 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_cert.o: 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_key.o: 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/data/test_root_cert.o: 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/cq_verifier.o: 
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/endpoint_tests.o: 
-$(OBJDIR)/$(CONFIG)/test/core/statistics/census_log_tests.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/grpc_profiler.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/parse_hexstring.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/port_posix.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/port_windows.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/slice_splitter.o: 
+
+
+
+
+
+
+
+
+
+
+
 
 
 LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
@@ -3560,14 +3560,14 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGRPC_TEST_UTIL_UNSECURE_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/cq_verifier.o: 
-$(OBJDIR)/$(CONFIG)/test/core/iomgr/endpoint_tests.o: 
-$(OBJDIR)/$(CONFIG)/test/core/statistics/census_log_tests.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/grpc_profiler.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/parse_hexstring.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/port_posix.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/port_windows.o: 
-$(OBJDIR)/$(CONFIG)/test/core/util/slice_splitter.o: 
+
+
+
+
+
+
+
+
 
 
 LIBGRPC_UNSECURE_SRC = \
@@ -3712,104 +3712,104 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGRPC_UNSECURE_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/src/core/surface/init_unsecure.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/call_op_string.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/census_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/channel_args.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/channel_stack.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/child_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/client_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/client_setup.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/connected_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/http_client_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/http_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/http_server_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/channel/noop_filter.o: 
-$(OBJDIR)/$(CONFIG)/src/core/compression/algorithm.o: 
-$(OBJDIR)/$(CONFIG)/src/core/compression/message_compress.o: 
-$(OBJDIR)/$(CONFIG)/src/core/debug/trace.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/alarm_heap.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint_pair_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/endpoint_pair_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/fd_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iocp_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/iomgr_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_kick.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_epoll.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_multipoller_with_poll_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/pollset_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/resolve_address_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/resolve_address_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/sockaddr_utils.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_common_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_linux.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_utils_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/socket_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_client_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_client_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_server_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_server_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/tcp_windows.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/time_averaged_stats.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_eventfd.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_nospecial.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_pipe.o: 
-$(OBJDIR)/$(CONFIG)/src/core/iomgr/wakeup_fd_posix.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json_reader.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json_string.o: 
-$(OBJDIR)/$(CONFIG)/src/core/json/json_writer.o: 
-$(OBJDIR)/$(CONFIG)/src/core/profiling/timers.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_init.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_log.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_rpc_stats.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/census_tracing.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/hash_table.o: 
-$(OBJDIR)/$(CONFIG)/src/core/statistics/window_stats.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer_queue.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/byte_buffer_reader.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/call.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/call_details.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/call_log_batch.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/channel.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/channel_create.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/client.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/completion_queue.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/event_string.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/init.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/lame_client.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/metadata_array.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/server.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/server_chttp2.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/server_create.o: 
-$(OBJDIR)/$(CONFIG)/src/core/surface/surface_trace.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/alpn.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/bin_encoder.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_data.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_goaway.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_ping.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_rst_stream.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_settings.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/frame_window_update.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/hpack_parser.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/hpack_table.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/huffsyms.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/status_conversion.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/stream_encoder.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/stream_map.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/timeout_encoding.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2/varint.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/chttp2_transport.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/metadata.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/stream_op.o: 
-$(OBJDIR)/$(CONFIG)/src/core/transport/transport.o: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 LIBGRPC++_SRC = \
@@ -3943,32 +3943,32 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/secure_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/secure_server_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/channel.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/channel_arguments.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/client_context.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/client_unary_call.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/create_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/generic_stub.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/insecure_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/internal_stub.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/common/call.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/common/completion_queue.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/common/rpc_method.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/proto/proto_utils.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/async_generic_service.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/insecure_server_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server_builder.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server_context.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/thread_pool.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/byte_buffer.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/slice.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/status.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/time.o: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 LIBGRPC++_TEST_CONFIG_SRC = \
@@ -4017,7 +4017,7 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/cpp/util/test_config.o: 
+
 
 
 LIBGRPC++_TEST_UTIL_SRC = \
@@ -4188,30 +4188,30 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGRPC++_UNSECURE_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/channel.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/channel_arguments.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/client_context.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/client_unary_call.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/create_channel.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/generic_stub.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/insecure_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/client/internal_stub.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/common/call.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/common/completion_queue.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/common/rpc_method.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/proto/proto_utils.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/async_generic_service.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/insecure_server_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server_builder.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server_context.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/server_credentials.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/server/thread_pool.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/byte_buffer.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/slice.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/status.o: 
-$(OBJDIR)/$(CONFIG)/src/cpp/util/time.o: 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 LIBGRPC_PLUGIN_SUPPORT_SRC = \
@@ -4250,10 +4250,10 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGRPC_PLUGIN_SUPPORT_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/src/compiler/cpp_generator.o: 
-$(OBJDIR)/$(CONFIG)/src/compiler/objective_c_generator.o: 
-$(OBJDIR)/$(CONFIG)/src/compiler/python_generator.o: 
-$(OBJDIR)/$(CONFIG)/src/compiler/ruby_generator.o: 
+
+
+
+
 
 
 LIBINTEROP_CLIENT_HELPER_SRC = \
@@ -4302,7 +4302,7 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/client_helper.o: 
+
 
 
 LIBINTEROP_CLIENT_MAIN_SRC = \
@@ -4408,7 +4408,7 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/server_helper.o: 
+
 
 
 LIBINTEROP_SERVER_MAIN_SRC = \
@@ -4646,7 +4646,7 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/src/csharp/ext/grpc_csharp_ext.o: 
+
 
 
 LIBEND2END_FIXTURE_CHTTP2_FAKE_SECURITY_SRC = \
@@ -4685,7 +4685,7 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_fake_security.o: 
+
 
 
 LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_SRC = \
@@ -4710,7 +4710,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_fullstack.o: 
+
 
 
 LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_UDS_SRC = \
@@ -4735,7 +4735,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_UDS_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_fullstack_uds.o: 
+
 
 
 LIBEND2END_FIXTURE_CHTTP2_SIMPLE_SSL_FULLSTACK_SRC = \
@@ -4774,7 +4774,7 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_simple_ssl_fullstack.o: 
+
 
 
 LIBEND2END_FIXTURE_CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_SRC = \
@@ -4813,7 +4813,7 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.o: 
+
 
 
 LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_SRC = \
@@ -4838,7 +4838,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_socket_pair.o: 
+
 
 
 LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_SRC = \
@@ -4863,7 +4863,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/fixtures/chttp2_socket_pair_one_byte_at_a_time.o: 
+
 
 
 LIBEND2END_TEST_BAD_HOSTNAME_SRC = \
@@ -4888,7 +4888,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_BAD_HOSTNAME_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/bad_hostname.o: 
+
 
 
 LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_SRC = \
@@ -4913,7 +4913,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_accept.o: 
+
 
 
 LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_SRC = \
@@ -4938,7 +4938,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_accept_and_writes_closed.o: 
+
 
 
 LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_LEGACY_SRC = \
@@ -4963,7 +4963,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_accept_and_writes_closed_legacy.o: 
+
 
 
 LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_LEGACY_SRC = \
@@ -4988,7 +4988,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_accept_legacy.o: 
+
 
 
 LIBEND2END_TEST_CANCEL_AFTER_INVOKE_SRC = \
@@ -5013,7 +5013,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_AFTER_INVOKE_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_invoke.o: 
+
 
 
 LIBEND2END_TEST_CANCEL_AFTER_INVOKE_LEGACY_SRC = \
@@ -5038,7 +5038,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_AFTER_INVOKE_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_after_invoke_legacy.o: 
+
 
 
 LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_SRC = \
@@ -5063,7 +5063,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_before_invoke.o: 
+
 
 
 LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_LEGACY_SRC = \
@@ -5088,7 +5088,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_before_invoke_legacy.o: 
+
 
 
 LIBEND2END_TEST_CANCEL_IN_A_VACUUM_SRC = \
@@ -5113,7 +5113,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_IN_A_VACUUM_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_in_a_vacuum.o: 
+
 
 
 LIBEND2END_TEST_CANCEL_IN_A_VACUUM_LEGACY_SRC = \
@@ -5138,7 +5138,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CANCEL_IN_A_VACUUM_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/cancel_in_a_vacuum_legacy.o: 
+
 
 
 LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_SRC = \
@@ -5163,7 +5163,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/census_simple_request.o: 
+
 
 
 LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_LEGACY_SRC = \
@@ -5188,7 +5188,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/census_simple_request_legacy.o: 
+
 
 
 LIBEND2END_TEST_DISAPPEARING_SERVER_SRC = \
@@ -5213,7 +5213,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_DISAPPEARING_SERVER_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/disappearing_server.o: 
+
 
 
 LIBEND2END_TEST_DISAPPEARING_SERVER_LEGACY_SRC = \
@@ -5238,7 +5238,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_DISAPPEARING_SERVER_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/disappearing_server_legacy.o: 
+
 
 
 LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_SRC = \
@@ -5263,7 +5263,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.o: 
+
 
 
 LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_LEGACY_SRC = \
@@ -5288,7 +5288,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls_legacy.o: 
+
 
 
 LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_SRC = \
@@ -5313,7 +5313,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/early_server_shutdown_finishes_tags.o: 
+
 
 
 LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_LEGACY_SRC = \
@@ -5338,7 +5338,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/early_server_shutdown_finishes_tags_legacy.o: 
+
 
 
 LIBEND2END_TEST_EMPTY_BATCH_SRC = \
@@ -5363,7 +5363,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_EMPTY_BATCH_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/empty_batch.o: 
+
 
 
 LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_SRC = \
@@ -5388,7 +5388,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/graceful_server_shutdown.o: 
+
 
 
 LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_LEGACY_SRC = \
@@ -5413,7 +5413,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/graceful_server_shutdown_legacy.o: 
+
 
 
 LIBEND2END_TEST_INVOKE_LARGE_REQUEST_SRC = \
@@ -5438,7 +5438,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_INVOKE_LARGE_REQUEST_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/invoke_large_request.o: 
+
 
 
 LIBEND2END_TEST_INVOKE_LARGE_REQUEST_LEGACY_SRC = \
@@ -5463,7 +5463,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_INVOKE_LARGE_REQUEST_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/invoke_large_request_legacy.o: 
+
 
 
 LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_SRC = \
@@ -5488,7 +5488,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/max_concurrent_streams.o: 
+
 
 
 LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_LEGACY_SRC = \
@@ -5513,7 +5513,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/max_concurrent_streams_legacy.o: 
+
 
 
 LIBEND2END_TEST_NO_OP_SRC = \
@@ -5538,7 +5538,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_NO_OP_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/no_op.o: 
+
 
 
 LIBEND2END_TEST_NO_OP_LEGACY_SRC = \
@@ -5563,7 +5563,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_NO_OP_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/no_op_legacy.o: 
+
 
 
 LIBEND2END_TEST_PING_PONG_STREAMING_SRC = \
@@ -5588,7 +5588,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_PING_PONG_STREAMING_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/ping_pong_streaming.o: 
+
 
 
 LIBEND2END_TEST_PING_PONG_STREAMING_LEGACY_SRC = \
@@ -5613,7 +5613,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_PING_PONG_STREAMING_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/ping_pong_streaming_legacy.o: 
+
 
 
 LIBEND2END_TEST_REGISTERED_CALL_SRC = \
@@ -5638,7 +5638,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REGISTERED_CALL_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/registered_call.o: 
+
 
 
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_SRC = \
@@ -5663,7 +5663,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_binary_metadata_and_payload.o: 
+
 
 
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_LEGACY_SRC = \
@@ -5688,7 +5688,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_binary_metadata_and_payload_legacy.o: 
+
 
 
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_SRC = \
@@ -5713,7 +5713,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_metadata_and_payload.o: 
+
 
 
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_LEGACY_SRC = \
@@ -5738,7 +5738,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_metadata_and_payload_legacy.o: 
+
 
 
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_SRC = \
@@ -5763,7 +5763,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_payload.o: 
+
 
 
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_LEGACY_SRC = \
@@ -5788,7 +5788,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_payload_legacy.o: 
+
 
 
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_LEGACY_SRC = \
@@ -5813,7 +5813,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_response_with_trailing_metadata_and_payload_legacy.o: 
+
 
 
 LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_SRC = \
@@ -5838,7 +5838,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_with_large_metadata.o: 
+
 
 
 LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_LEGACY_SRC = \
@@ -5863,7 +5863,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_with_large_metadata_legacy.o: 
+
 
 
 LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_SRC = \
@@ -5888,7 +5888,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_with_payload.o: 
+
 
 
 LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_LEGACY_SRC = \
@@ -5913,7 +5913,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/request_with_payload_legacy.o: 
+
 
 
 LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_SRC = \
@@ -5938,7 +5938,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/simple_delayed_request.o: 
+
 
 
 LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_LEGACY_SRC = \
@@ -5963,7 +5963,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/simple_delayed_request_legacy.o: 
+
 
 
 LIBEND2END_TEST_SIMPLE_REQUEST_SRC = \
@@ -5988,7 +5988,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_SIMPLE_REQUEST_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/simple_request.o: 
+
 
 
 LIBEND2END_TEST_SIMPLE_REQUEST_LEGACY_SRC = \
@@ -6013,7 +6013,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_SIMPLE_REQUEST_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/simple_request_legacy.o: 
+
 
 
 LIBEND2END_TEST_THREAD_STRESS_SRC = \
@@ -6038,7 +6038,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_THREAD_STRESS_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/thread_stress.o: 
+
 
 
 LIBEND2END_TEST_THREAD_STRESS_LEGACY_SRC = \
@@ -6063,7 +6063,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_THREAD_STRESS_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/thread_stress_legacy.o: 
+
 
 
 LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_SRC = \
@@ -6088,7 +6088,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/writes_done_hangs_with_pending_read.o: 
+
 
 
 LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_LEGACY_SRC = \
@@ -6113,7 +6113,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_LEGACY_OBJS:.o=.dep)
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/tests/writes_done_hangs_with_pending_read_legacy.o: 
+
 
 
 LIBEND2END_CERTS_SRC = \
@@ -6154,9 +6154,9 @@ ifneq ($(NO_DEPS),true)
 endif
 endif
 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/data/test_root_cert.o: 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_cert.o: 
-$(OBJDIR)/$(CONFIG)/test/core/end2end/data/server1_key.o: 
+
+
+
 
 
 
diff --git a/templates/Makefile.template b/templates/Makefile.template
index 9ca55f4f24..f78639b240 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -1210,7 +1210,7 @@ endif
 % endif
 
 % for src in lib.src:
-% if not proto_re.match(src):
+% if not proto_re.match(src) and any(proto_re.match(src2) for src2 in lib.src):
 $(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: \
 % for src2 in lib.src:
 % if proto_re.match(src2):
-- 
cgit v1.2.3


From 2660ebcff0caaf426f2dec8682316d84b7817ecb Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 24 Apr 2015 14:31:30 -0700
Subject: Actually remove them

---
 Makefile                    | 500 +-------------------------------------------
 templates/Makefile.template |   2 -
 2 files changed, 4 insertions(+), 498 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index e8ab321ff7..ea4c50f237 100644
--- a/Makefile
+++ b/Makefile
@@ -3102,42 +3102,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 LIBGPR_TEST_UTIL_SRC = \
     test/core/util/test_config.c \
 
@@ -3161,8 +3125,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBGRPC_SRC = \
     src/core/httpcli/format_request.c \
     src/core/httpcli/httpcli.c \
@@ -3352,124 +3314,6 @@ endif
 endif
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 LIBGRPC_TEST_UTIL_SRC = \
     test/core/end2end/data/server1_cert.c \
     test/core/end2end/data/server1_key.c \
@@ -3518,18 +3362,6 @@ endif
 endif
 
 
-
-
-
-
-
-
-
-
-
-
-
-
 LIBGRPC_TEST_UTIL_UNSECURE_SRC = \
     test/core/end2end/cq_verifier.c \
     test/core/iomgr/endpoint_tests.c \
@@ -3561,15 +3393,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
-
-
-
-
-
-
-
 LIBGRPC_UNSECURE_SRC = \
     src/core/surface/init_unsecure.c \
     src/core/channel/call_op_string.c \
@@ -3713,105 +3536,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 LIBGRPC++_SRC = \
     src/cpp/client/secure_credentials.cc \
     src/cpp/server/secure_server_credentials.cc \
@@ -3944,33 +3668,6 @@ endif
 endif
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 LIBGRPC++_TEST_CONFIG_SRC = \
     test/cpp/util/test_config.cc \
 
@@ -4018,8 +3715,6 @@ endif
 endif
 
 
-
-
 LIBGRPC++_TEST_UTIL_SRC = \
     $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc \
     $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc \
@@ -4069,13 +3764,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGRPC++_TEST_UTIL_OBJS:.o=.dep)
 endif
 endif
-
-
-
-
-$(OBJDIR)/$(CONFIG)/test/cpp/util/cli_call.o:     $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/util/create_test_channel.o:     $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc
-
+$(OBJDIR)/$(CONFIG)/test/cpp/util/cli_call.o:     $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/util/create_test_channel.o:     $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc
 
 LIBGRPC++_UNSECURE_SRC = \
     src/cpp/client/channel.cc \
@@ -4189,31 +3878,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 LIBGRPC_PLUGIN_SUPPORT_SRC = \
     src/compiler/cpp_generator.cc \
     src/compiler/objective_c_generator.cc \
@@ -4251,11 +3915,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
-
-
-
 LIBINTEROP_CLIENT_HELPER_SRC = \
     test/cpp/interop/client_helper.cc \
 
@@ -4303,8 +3962,6 @@ endif
 endif
 
 
-
-
 LIBINTEROP_CLIENT_MAIN_SRC = \
     $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc \
     $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc \
@@ -4354,13 +4011,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBINTEROP_CLIENT_MAIN_OBJS:.o=.dep)
 endif
 endif
-
-
-
-
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/client.o:     $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc    $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc    $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_client.o:     $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc    $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc    $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc
-
+$(OBJDIR)/$(CONFIG)/test/cpp/interop/client.o:     $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc    $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc    $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_client.o:     $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc    $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc    $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc
 
 LIBINTEROP_SERVER_HELPER_SRC = \
     test/cpp/interop/server_helper.cc \
@@ -4409,8 +4060,6 @@ endif
 endif
 
 
-
-
 LIBINTEROP_SERVER_MAIN_SRC = \
     $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc \
     $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc \
@@ -4459,13 +4108,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBINTEROP_SERVER_MAIN_OBJS:.o=.dep)
 endif
 endif
-
-
-
-
 $(OBJDIR)/$(CONFIG)/test/cpp/interop/server.o:     $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc    $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc    $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc
 
-
 LIBPUBSUB_CLIENT_LIB_SRC = \
     $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc \
     $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc \
@@ -4515,13 +4159,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBPUBSUB_CLIENT_LIB_OBJS:.o=.dep)
 endif
 endif
-
-
-
-
-$(OBJDIR)/$(CONFIG)/examples/pubsub/publisher.o:     $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc    $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc    $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/examples/pubsub/subscriber.o:     $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc    $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc    $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc
-
+$(OBJDIR)/$(CONFIG)/examples/pubsub/publisher.o:     $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc    $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc    $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc$(OBJDIR)/$(CONFIG)/examples/pubsub/subscriber.o:     $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc    $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc    $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc
 
 LIBQPS_SRC = \
     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc \
@@ -4576,17 +4214,7 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBQPS_OBJS:.o=.dep)
 endif
 endif
-
-
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_async.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_sync.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/driver.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_worker.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/report.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_async.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_sync.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/timer.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
-
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_async.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_sync.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/driver.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_worker.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/report.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_async.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_sync.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/timer.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
 
 LIBGRPC_CSHARP_EXT_SRC = \
     src/csharp/ext/grpc_csharp_ext.c \
@@ -4647,8 +4275,6 @@ endif
 endif
 
 
-
-
 LIBEND2END_FIXTURE_CHTTP2_FAKE_SECURITY_SRC = \
     test/core/end2end/fixtures/chttp2_fake_security.c \
 
@@ -4686,8 +4312,6 @@ endif
 endif
 
 
-
-
 LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_SRC = \
     test/core/end2end/fixtures/chttp2_fullstack.c \
 
@@ -4711,8 +4335,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_FIXTURE_CHTTP2_FULLSTACK_UDS_SRC = \
     test/core/end2end/fixtures/chttp2_fullstack_uds.c \
 
@@ -4736,8 +4358,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_FIXTURE_CHTTP2_SIMPLE_SSL_FULLSTACK_SRC = \
     test/core/end2end/fixtures/chttp2_simple_ssl_fullstack.c \
 
@@ -4775,8 +4395,6 @@ endif
 endif
 
 
-
-
 LIBEND2END_FIXTURE_CHTTP2_SIMPLE_SSL_WITH_OAUTH2_FULLSTACK_SRC = \
     test/core/end2end/fixtures/chttp2_simple_ssl_with_oauth2_fullstack.c \
 
@@ -4814,8 +4432,6 @@ endif
 endif
 
 
-
-
 LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_SRC = \
     test/core/end2end/fixtures/chttp2_socket_pair.c \
 
@@ -4839,8 +4455,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_FIXTURE_CHTTP2_SOCKET_PAIR_ONE_BYTE_AT_A_TIME_SRC = \
     test/core/end2end/fixtures/chttp2_socket_pair_one_byte_at_a_time.c \
 
@@ -4864,8 +4478,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_BAD_HOSTNAME_SRC = \
     test/core/end2end/tests/bad_hostname.c \
 
@@ -4889,8 +4501,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_SRC = \
     test/core/end2end/tests/cancel_after_accept.c \
 
@@ -4914,8 +4524,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_SRC = \
     test/core/end2end/tests/cancel_after_accept_and_writes_closed.c \
 
@@ -4939,8 +4547,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_AND_WRITES_CLOSED_LEGACY_SRC = \
     test/core/end2end/tests/cancel_after_accept_and_writes_closed_legacy.c \
 
@@ -4964,8 +4570,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_CANCEL_AFTER_ACCEPT_LEGACY_SRC = \
     test/core/end2end/tests/cancel_after_accept_legacy.c \
 
@@ -4989,8 +4593,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_CANCEL_AFTER_INVOKE_SRC = \
     test/core/end2end/tests/cancel_after_invoke.c \
 
@@ -5014,8 +4616,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_CANCEL_AFTER_INVOKE_LEGACY_SRC = \
     test/core/end2end/tests/cancel_after_invoke_legacy.c \
 
@@ -5039,8 +4639,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_SRC = \
     test/core/end2end/tests/cancel_before_invoke.c \
 
@@ -5064,8 +4662,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_CANCEL_BEFORE_INVOKE_LEGACY_SRC = \
     test/core/end2end/tests/cancel_before_invoke_legacy.c \
 
@@ -5089,8 +4685,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_CANCEL_IN_A_VACUUM_SRC = \
     test/core/end2end/tests/cancel_in_a_vacuum.c \
 
@@ -5114,8 +4708,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_CANCEL_IN_A_VACUUM_LEGACY_SRC = \
     test/core/end2end/tests/cancel_in_a_vacuum_legacy.c \
 
@@ -5139,8 +4731,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_SRC = \
     test/core/end2end/tests/census_simple_request.c \
 
@@ -5164,8 +4754,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_CENSUS_SIMPLE_REQUEST_LEGACY_SRC = \
     test/core/end2end/tests/census_simple_request_legacy.c \
 
@@ -5189,8 +4777,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_DISAPPEARING_SERVER_SRC = \
     test/core/end2end/tests/disappearing_server.c \
 
@@ -5214,8 +4800,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_DISAPPEARING_SERVER_LEGACY_SRC = \
     test/core/end2end/tests/disappearing_server_legacy.c \
 
@@ -5239,8 +4823,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_SRC = \
     test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls.c \
 
@@ -5264,8 +4846,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_INFLIGHT_CALLS_LEGACY_SRC = \
     test/core/end2end/tests/early_server_shutdown_finishes_inflight_calls_legacy.c \
 
@@ -5289,8 +4869,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_SRC = \
     test/core/end2end/tests/early_server_shutdown_finishes_tags.c \
 
@@ -5314,8 +4892,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_EARLY_SERVER_SHUTDOWN_FINISHES_TAGS_LEGACY_SRC = \
     test/core/end2end/tests/early_server_shutdown_finishes_tags_legacy.c \
 
@@ -5339,8 +4915,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_EMPTY_BATCH_SRC = \
     test/core/end2end/tests/empty_batch.c \
 
@@ -5364,8 +4938,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_SRC = \
     test/core/end2end/tests/graceful_server_shutdown.c \
 
@@ -5389,8 +4961,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_GRACEFUL_SERVER_SHUTDOWN_LEGACY_SRC = \
     test/core/end2end/tests/graceful_server_shutdown_legacy.c \
 
@@ -5414,8 +4984,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_INVOKE_LARGE_REQUEST_SRC = \
     test/core/end2end/tests/invoke_large_request.c \
 
@@ -5439,8 +5007,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_INVOKE_LARGE_REQUEST_LEGACY_SRC = \
     test/core/end2end/tests/invoke_large_request_legacy.c \
 
@@ -5464,8 +5030,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_SRC = \
     test/core/end2end/tests/max_concurrent_streams.c \
 
@@ -5489,8 +5053,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_MAX_CONCURRENT_STREAMS_LEGACY_SRC = \
     test/core/end2end/tests/max_concurrent_streams_legacy.c \
 
@@ -5514,8 +5076,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_NO_OP_SRC = \
     test/core/end2end/tests/no_op.c \
 
@@ -5539,8 +5099,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_NO_OP_LEGACY_SRC = \
     test/core/end2end/tests/no_op_legacy.c \
 
@@ -5564,8 +5122,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_PING_PONG_STREAMING_SRC = \
     test/core/end2end/tests/ping_pong_streaming.c \
 
@@ -5589,8 +5145,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_PING_PONG_STREAMING_LEGACY_SRC = \
     test/core/end2end/tests/ping_pong_streaming_legacy.c \
 
@@ -5614,8 +5168,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_REGISTERED_CALL_SRC = \
     test/core/end2end/tests/registered_call.c \
 
@@ -5639,8 +5191,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_SRC = \
     test/core/end2end/tests/request_response_with_binary_metadata_and_payload.c \
 
@@ -5664,8 +5214,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_BINARY_METADATA_AND_PAYLOAD_LEGACY_SRC = \
     test/core/end2end/tests/request_response_with_binary_metadata_and_payload_legacy.c \
 
@@ -5689,8 +5237,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_SRC = \
     test/core/end2end/tests/request_response_with_metadata_and_payload.c \
 
@@ -5714,8 +5260,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_METADATA_AND_PAYLOAD_LEGACY_SRC = \
     test/core/end2end/tests/request_response_with_metadata_and_payload_legacy.c \
 
@@ -5739,8 +5283,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_SRC = \
     test/core/end2end/tests/request_response_with_payload.c \
 
@@ -5764,8 +5306,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_PAYLOAD_LEGACY_SRC = \
     test/core/end2end/tests/request_response_with_payload_legacy.c \
 
@@ -5789,8 +5329,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_REQUEST_RESPONSE_WITH_TRAILING_METADATA_AND_PAYLOAD_LEGACY_SRC = \
     test/core/end2end/tests/request_response_with_trailing_metadata_and_payload_legacy.c \
 
@@ -5814,8 +5352,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_SRC = \
     test/core/end2end/tests/request_with_large_metadata.c \
 
@@ -5839,8 +5375,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_REQUEST_WITH_LARGE_METADATA_LEGACY_SRC = \
     test/core/end2end/tests/request_with_large_metadata_legacy.c \
 
@@ -5864,8 +5398,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_SRC = \
     test/core/end2end/tests/request_with_payload.c \
 
@@ -5889,8 +5421,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_REQUEST_WITH_PAYLOAD_LEGACY_SRC = \
     test/core/end2end/tests/request_with_payload_legacy.c \
 
@@ -5914,8 +5444,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_SRC = \
     test/core/end2end/tests/simple_delayed_request.c \
 
@@ -5939,8 +5467,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_SIMPLE_DELAYED_REQUEST_LEGACY_SRC = \
     test/core/end2end/tests/simple_delayed_request_legacy.c \
 
@@ -5964,8 +5490,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_SIMPLE_REQUEST_SRC = \
     test/core/end2end/tests/simple_request.c \
 
@@ -5989,8 +5513,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_SIMPLE_REQUEST_LEGACY_SRC = \
     test/core/end2end/tests/simple_request_legacy.c \
 
@@ -6014,8 +5536,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_THREAD_STRESS_SRC = \
     test/core/end2end/tests/thread_stress.c \
 
@@ -6039,8 +5559,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_THREAD_STRESS_LEGACY_SRC = \
     test/core/end2end/tests/thread_stress_legacy.c \
 
@@ -6064,8 +5582,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_SRC = \
     test/core/end2end/tests/writes_done_hangs_with_pending_read.c \
 
@@ -6089,8 +5605,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_TEST_WRITES_DONE_HANGS_WITH_PENDING_READ_LEGACY_SRC = \
     test/core/end2end/tests/writes_done_hangs_with_pending_read_legacy.c \
 
@@ -6114,8 +5628,6 @@ ifneq ($(NO_DEPS),true)
 endif
 
 
-
-
 LIBEND2END_CERTS_SRC = \
     test/core/end2end/data/test_root_cert.c \
     test/core/end2end/data/server1_cert.c \
@@ -6156,10 +5668,6 @@ endif
 
 
 
-
-
-
-
 # All of the test targets, and protoc plugins
 
 
diff --git a/templates/Makefile.template b/templates/Makefile.template
index f78639b240..cfab872819 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -1208,7 +1208,6 @@ endif
 % if lib.get('secure', 'check') == 'yes' or lib.get('secure', 'check') == 'check':
 endif
 % endif
-
 % for src in lib.src:
 % if not proto_re.match(src) and any(proto_re.match(src2) for src2 in lib.src):
 $(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: \
@@ -1218,7 +1217,6 @@ $(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: \
 % endif
 % endfor
 % endif
-
 % endfor
 </%def>
 
-- 
cgit v1.2.3


From 04f8156f658b06166f1e0111a9da0245b03a1de6 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 24 Apr 2015 14:34:30 -0700
Subject: Cleanup

---
 Makefile                    | 25 ++++++++++++++++++++-----
 templates/Makefile.template |  7 +------
 2 files changed, 21 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index ea4c50f237..d735b3b37f 100644
--- a/Makefile
+++ b/Makefile
@@ -3764,7 +3764,9 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBGRPC++_TEST_UTIL_OBJS:.o=.dep)
 endif
 endif
-$(OBJDIR)/$(CONFIG)/test/cpp/util/cli_call.o:     $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/util/create_test_channel.o:     $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc    $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/util/cli_call.o: $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/util/create_test_channel.o: $(GENDIR)/test/cpp/util/messages.pb.cc $(GENDIR)/test/cpp/util/messages.grpc.pb.cc $(GENDIR)/test/cpp/util/echo.pb.cc $(GENDIR)/test/cpp/util/echo.grpc.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.pb.cc $(GENDIR)/test/cpp/util/echo_duplicate.grpc.pb.cc
+
 
 LIBGRPC++_UNSECURE_SRC = \
     src/cpp/client/channel.cc \
@@ -4011,7 +4013,9 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBINTEROP_CLIENT_MAIN_OBJS:.o=.dep)
 endif
 endif
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/client.o:     $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc    $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc    $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_client.o:     $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc    $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc    $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/interop/client.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/interop/interop_client.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc
+
 
 LIBINTEROP_SERVER_HELPER_SRC = \
     test/cpp/interop/server_helper.cc \
@@ -4108,7 +4112,8 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBINTEROP_SERVER_MAIN_OBJS:.o=.dep)
 endif
 endif
-$(OBJDIR)/$(CONFIG)/test/cpp/interop/server.o:     $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc    $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc    $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/interop/server.o: $(GENDIR)/test/proto/empty.pb.cc $(GENDIR)/test/proto/empty.grpc.pb.cc $(GENDIR)/test/proto/messages.pb.cc $(GENDIR)/test/proto/messages.grpc.pb.cc $(GENDIR)/test/proto/test.pb.cc $(GENDIR)/test/proto/test.grpc.pb.cc
+
 
 LIBPUBSUB_CLIENT_LIB_SRC = \
     $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc \
@@ -4159,7 +4164,9 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBPUBSUB_CLIENT_LIB_OBJS:.o=.dep)
 endif
 endif
-$(OBJDIR)/$(CONFIG)/examples/pubsub/publisher.o:     $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc    $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc    $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc$(OBJDIR)/$(CONFIG)/examples/pubsub/subscriber.o:     $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc    $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc    $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/examples/pubsub/publisher.o: $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/examples/pubsub/subscriber.o: $(GENDIR)/examples/pubsub/label.pb.cc $(GENDIR)/examples/pubsub/label.grpc.pb.cc $(GENDIR)/examples/pubsub/empty.pb.cc $(GENDIR)/examples/pubsub/empty.grpc.pb.cc $(GENDIR)/examples/pubsub/pubsub.pb.cc $(GENDIR)/examples/pubsub/pubsub.grpc.pb.cc
+
 
 LIBQPS_SRC = \
     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc \
@@ -4214,7 +4221,15 @@ ifneq ($(NO_DEPS),true)
 -include $(LIBQPS_OBJS:.o=.dep)
 endif
 endif
-$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_async.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_sync.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/driver.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_worker.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/report.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_async.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_sync.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc$(OBJDIR)/$(CONFIG)/test/cpp/qps/timer.o:     $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_async.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/client_sync.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/driver.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/qps_worker.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/report.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_async.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/server_sync.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+$(OBJDIR)/$(CONFIG)/test/cpp/qps/timer.o: $(GENDIR)/test/cpp/qps/qpstest.pb.cc $(GENDIR)/test/cpp/qps/qpstest.grpc.pb.cc
+
 
 LIBGRPC_CSHARP_EXT_SRC = \
     src/csharp/ext/grpc_csharp_ext.c \
diff --git a/templates/Makefile.template b/templates/Makefile.template
index cfab872819..ab137a8657 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -1210,12 +1210,7 @@ endif
 % endif
 % for src in lib.src:
 % if not proto_re.match(src) and any(proto_re.match(src2) for src2 in lib.src):
-$(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: \
-% for src2 in lib.src:
-% if proto_re.match(src2):
-    ${proto_to_cc(src2)}\
-% endif
-% endfor
+$(OBJDIR)/$(CONFIG)/${os.path.splitext(src)[0]}.o: ${' '.join(proto_to_cc(src2) for src2 in lib.src if proto_re.match(src2))}
 % endif
 % endfor
 </%def>
-- 
cgit v1.2.3


From f5fcafde8108089b67ecd3f06d4c119b5b2751ad Mon Sep 17 00:00:00 2001
From: David Garcia Quintas <dgq@google.com>
Date: Fri, 24 Apr 2015 16:12:54 -0700
Subject: Renamed make variables for protoc presence and version checking.

---
 Makefile                    | 10 +++++-----
 templates/Makefile.template | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8cd71600ad..4d18c4ad18 100644
--- a/Makefile
+++ b/Makefile
@@ -348,8 +348,8 @@ OPENSSL_ALPN_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/ope
 ZLIB_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/zlib.c -lz $(LDFLAGS)
 PERFTOOLS_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/perftools.c -lprofiler $(LDFLAGS)
 PROTOBUF_CHECK_CMD = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/protobuf.cc -lprotobuf $(LDFLAGS)
-PROTOC_CMD = which protoc > /dev/null
-PROTOC_CHECK_CMD = protoc --version | grep -q libprotoc.3
+PROTOC_CHECK_CMD = which protoc > /dev/null
+PROTOC_CHECK_VERSION_CMD = protoc --version | grep -q libprotoc.3
 
 ifeq ($(OPENSSL_REQUIRES_DL),true)
 OPENSSL_ALPN_CHECK_CMD += -ldl
@@ -375,9 +375,9 @@ HAS_SYSTEM_ZLIB = false
 HAS_SYSTEM_PROTOBUF = false
 endif
 
-HAS_PROTOC = $(shell $(PROTOC_CMD) 2> /dev/null && echo true || echo false)
+HAS_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
 ifeq ($(HAS_PROTOC),true)
-HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
+HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_VERSION_CMD) 2> /dev/null && echo true || echo false)
 else
 HAS_VALID_PROTOC = false
 endif
@@ -1212,7 +1212,7 @@ run_dep_checks:
 	$(ZLIB_CHECK_CMD) || true
 	$(PERFTOOLS_CHECK_CMD) || true
 	$(PROTOBUF_CHECK_CMD) || true
-	$(PROTOC_CHECK_CMD) || true
+	$(PROTOC_CHECK_VERSION_CMD) || true
 
 $(LIBDIR)/$(CONFIG)/zlib/libz.a:
 	$(E) "[MAKE]    Building zlib"
diff --git a/templates/Makefile.template b/templates/Makefile.template
index 9ca55f4f24..21c29454c3 100644
--- a/templates/Makefile.template
+++ b/templates/Makefile.template
@@ -362,8 +362,8 @@ OPENSSL_ALPN_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/ope
 ZLIB_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/zlib.c -lz $(LDFLAGS)
 PERFTOOLS_CHECK_CMD = $(CC) $(CFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/perftools.c -lprofiler $(LDFLAGS)
 PROTOBUF_CHECK_CMD = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(TMPOUT) test/build/protobuf.cc -lprotobuf $(LDFLAGS)
-PROTOC_CMD = which protoc > /dev/null
-PROTOC_CHECK_CMD = protoc --version | grep -q libprotoc.3
+PROTOC_CHECK_CMD = which protoc > /dev/null
+PROTOC_CHECK_VERSION_CMD = protoc --version | grep -q libprotoc.3
 
 ifeq ($(OPENSSL_REQUIRES_DL),true)
 OPENSSL_ALPN_CHECK_CMD += -ldl
@@ -389,9 +389,9 @@ HAS_SYSTEM_ZLIB = false
 HAS_SYSTEM_PROTOBUF = false
 endif
 
-HAS_PROTOC = $(shell $(PROTOC_CMD) 2> /dev/null && echo true || echo false)
+HAS_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
 ifeq ($(HAS_PROTOC),true)
-HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_CMD) 2> /dev/null && echo true || echo false)
+HAS_VALID_PROTOC = $(shell $(PROTOC_CHECK_VERSION_CMD) 2> /dev/null && echo true || echo false)
 else
 HAS_VALID_PROTOC = false
 endif
@@ -587,7 +587,7 @@ run_dep_checks:
 	$(ZLIB_CHECK_CMD) || true
 	$(PERFTOOLS_CHECK_CMD) || true
 	$(PROTOBUF_CHECK_CMD) || true
-	$(PROTOC_CHECK_CMD) || true
+	$(PROTOC_CHECK_VERSION_CMD) || true
 
 $(LIBDIR)/$(CONFIG)/zlib/libz.a:
 	$(E) "[MAKE]    Building zlib"
-- 
cgit v1.2.3