diff -Naur a/Makefile b/Makefile
--- a/Makefile	2017-04-05 22:06:53.132122532 -0700
+++ b/Makefile	2017-04-05 22:09:34.861752084 -0700
@@ -2086,13 +2086,13 @@
 $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc: protoc_dep_error
 $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc: protoc_dep_error
 else
-$(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc: $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.h
+$(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.cc: $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.h ;
 $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.h: src/proto/grpc/lb/v1/load_balancer.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(PROTOC) -I$(PROTOBUF_SRC_DIR) -I. --cpp_out=$(GENDIR) $<
 
-$(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc: $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.h $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.h
+$(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.cc: $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.h $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.pb.h ;
 $(GENDIR)/src/proto/grpc/lb/v1/load_balancer.grpc.pb.h: src/proto/grpc/lb/v1/load_balancer.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
 	$(Q) mkdir -p `dirname $@`
@@ -2103,13 +2103,13 @@
 $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc: protoc_dep_error
 $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc: protoc_dep_error
 else
-$(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc: $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.h
+$(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.cc: $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.h ;
 $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.h: src/proto/grpc/reflection/v1alpha/reflection.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(PROTOC) -I$(PROTOBUF_SRC_DIR) -I. --cpp_out=$(GENDIR) $<
 
-$(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc: $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.h
+$(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.cc: $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.pb.h ;
 $(GENDIR)/src/proto/grpc/reflection/v1alpha/reflection.grpc.pb.h: src/proto/grpc/reflection/v1alpha/reflection.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
 	$(Q) mkdir -p `dirname $@`
@@ -2120,13 +2120,13 @@
 $(GENDIR)/src/proto/grpc/testing/compiler_test.pb.cc: protoc_dep_error
 $(GENDIR)/src/proto/grpc/testing/compiler_test.grpc.pb.cc: protoc_dep_error
 else
-$(GENDIR)/src/proto/grpc/testing/compiler_test.pb.cc: $(GENDIR)/src/proto/grpc/testing/compiler_test.pb.h
+$(GENDIR)/src/proto/grpc/testing/compiler_test.pb.cc: $(GENDIR)/src/proto/grpc/testing/compiler_test.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/compiler_test.pb.h: src/proto/grpc/testing/compiler_test.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(PROTOC) -I$(PROTOBUF_SRC_DIR) -I. --cpp_out=$(GENDIR) $<
 
-$(GENDIR)/src/proto/grpc/testing/compiler_test.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/compiler_test.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/compiler_test.pb.h
+$(GENDIR)/src/proto/grpc/testing/compiler_test.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/compiler_test.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/compiler_test.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/compiler_test.grpc.pb.h: src/proto/grpc/testing/compiler_test.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
 	$(Q) mkdir -p `dirname $@`
@@ -2137,13 +2137,13 @@
 $(GENDIR)/src/proto/grpc/testing/control.pb.cc: protoc_dep_error
 $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc: protoc_dep_error
 else
-$(GENDIR)/src/proto/grpc/testing/control.pb.cc: $(GENDIR)/src/proto/grpc/testing/control.pb.h
+$(GENDIR)/src/proto/grpc/testing/control.pb.cc: $(GENDIR)/src/proto/grpc/testing/control.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/control.pb.h: src/proto/grpc/testing/control.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc
 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(PROTOC) -I$(PROTOBUF_SRC_DIR) -I. --cpp_out=$(GENDIR) $<
 
-$(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/control.pb.h
+$(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/control.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.h: src/proto/grpc/testing/control.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.pb.cc $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc
 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
 	$(Q) mkdir -p `dirname $@`
@@ -2154,13 +2154,13 @@
 $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc: protoc_dep_error
 $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc: protoc_dep_error
 else
-$(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc: $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.h
+$(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.cc: $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.h: src/proto/grpc/testing/duplicate/echo_duplicate.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc
 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(PROTOC) -I$(PROTOBUF_SRC_DIR) -I. --cpp_out=$(GENDIR) $<
 
-$(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.h
+$(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/duplicate/echo_duplicate.grpc.pb.h: src/proto/grpc/testing/duplicate/echo_duplicate.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc
 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
 	$(Q) mkdir -p `dirname $@`
@@ -2171,13 +2171,13 @@
 $(GENDIR)/src/proto/grpc/testing/echo.pb.cc: protoc_dep_error
 $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc: protoc_dep_error
 else
-$(GENDIR)/src/proto/grpc/testing/echo.pb.cc: $(GENDIR)/src/proto/grpc/testing/echo.pb.h
+$(GENDIR)/src/proto/grpc/testing/echo.pb.cc: $(GENDIR)/src/proto/grpc/testing/echo.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/echo.pb.h: src/proto/grpc/testing/echo.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc
 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(PROTOC) -I$(PROTOBUF_SRC_DIR) -I. --cpp_out=$(GENDIR) $<
 
-$(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/echo.pb.h
+$(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/echo.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/echo.grpc.pb.h: src/proto/grpc/testing/echo.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc
 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
 	$(Q) mkdir -p `dirname $@`
@@ -2188,13 +2188,13 @@
 $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc: protoc_dep_error
 $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc: protoc_dep_error
 else
-$(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc: $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.h
+$(GENDIR)/src/proto/grpc/testing/echo_messages.pb.cc: $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.h: src/proto/grpc/testing/echo_messages.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(PROTOC) -I$(PROTOBUF_SRC_DIR) -I. --cpp_out=$(GENDIR) $<
 
-$(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.h
+$(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/echo_messages.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/echo_messages.grpc.pb.h: src/proto/grpc/testing/echo_messages.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
 	$(Q) mkdir -p `dirname $@`
@@ -2205,13 +2205,13 @@
 $(GENDIR)/src/proto/grpc/testing/empty.pb.cc: protoc_dep_error
 $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc: protoc_dep_error
 else
-$(GENDIR)/src/proto/grpc/testing/empty.pb.cc: $(GENDIR)/src/proto/grpc/testing/empty.pb.h
+$(GENDIR)/src/proto/grpc/testing/empty.pb.cc: $(GENDIR)/src/proto/grpc/testing/empty.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/empty.pb.h: src/proto/grpc/testing/empty.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(PROTOC) -I$(PROTOBUF_SRC_DIR) -I. --cpp_out=$(GENDIR) $<
 
-$(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/empty.pb.h
+$(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/empty.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.h: src/proto/grpc/testing/empty.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
 	$(Q) mkdir -p `dirname $@`
@@ -2222,13 +2222,13 @@
 $(GENDIR)/src/proto/grpc/testing/messages.pb.cc: protoc_dep_error
 $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc: protoc_dep_error
 else
-$(GENDIR)/src/proto/grpc/testing/messages.pb.cc: $(GENDIR)/src/proto/grpc/testing/messages.pb.h
+$(GENDIR)/src/proto/grpc/testing/messages.pb.cc: $(GENDIR)/src/proto/grpc/testing/messages.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/messages.pb.h: src/proto/grpc/testing/messages.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(PROTOC) -I$(PROTOBUF_SRC_DIR) -I. --cpp_out=$(GENDIR) $<
 
-$(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/messages.pb.h
+$(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/messages.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.h: src/proto/grpc/testing/messages.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
 	$(Q) mkdir -p `dirname $@`
@@ -2239,13 +2239,13 @@
 $(GENDIR)/src/proto/grpc/testing/metrics.pb.cc: protoc_dep_error
 $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc: protoc_dep_error
 else
-$(GENDIR)/src/proto/grpc/testing/metrics.pb.cc: $(GENDIR)/src/proto/grpc/testing/metrics.pb.h
+$(GENDIR)/src/proto/grpc/testing/metrics.pb.cc: $(GENDIR)/src/proto/grpc/testing/metrics.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/metrics.pb.h: src/proto/grpc/testing/metrics.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(PROTOC) -I$(PROTOBUF_SRC_DIR) -I. --cpp_out=$(GENDIR) $<
 
-$(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/metrics.pb.h
+$(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/metrics.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/metrics.grpc.pb.h: src/proto/grpc/testing/metrics.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
 	$(Q) mkdir -p `dirname $@`
@@ -2256,13 +2256,13 @@
 $(GENDIR)/src/proto/grpc/testing/payloads.pb.cc: protoc_dep_error
 $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc: protoc_dep_error
 else
-$(GENDIR)/src/proto/grpc/testing/payloads.pb.cc: $(GENDIR)/src/proto/grpc/testing/payloads.pb.h
+$(GENDIR)/src/proto/grpc/testing/payloads.pb.cc: $(GENDIR)/src/proto/grpc/testing/payloads.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/payloads.pb.h: src/proto/grpc/testing/payloads.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(PROTOC) -I$(PROTOBUF_SRC_DIR) -I. --cpp_out=$(GENDIR) $<
 
-$(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/payloads.pb.h
+$(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/payloads.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/payloads.grpc.pb.h: src/proto/grpc/testing/payloads.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
 	$(Q) mkdir -p `dirname $@`
@@ -2273,13 +2273,13 @@
 $(GENDIR)/src/proto/grpc/testing/services.pb.cc: protoc_dep_error
 $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc: protoc_dep_error
 else
-$(GENDIR)/src/proto/grpc/testing/services.pb.cc: $(GENDIR)/src/proto/grpc/testing/services.pb.h
-$(GENDIR)/src/proto/grpc/testing/services.pb.h: src/proto/grpc/testing/services.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc
+$(GENDIR)/src/proto/grpc/testing/services.pb.cc: $(GENDIR)/src/proto/grpc/testing/services.pb.h ;
+$(GENDIR)/src/proto/grpc/testing/services.pb.h: src/proto/grpc/testing/services.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc ;
 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(PROTOC) -I$(PROTOBUF_SRC_DIR) -I. --cpp_out=$(GENDIR) $<
 
-$(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/services.pb.h
+$(GENDIR)/src/proto/grpc/testing/services.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/services.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/services.grpc.pb.h: src/proto/grpc/testing/services.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/control.pb.cc $(GENDIR)/src/proto/grpc/testing/control.grpc.pb.cc
 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
 	$(Q) mkdir -p `dirname $@`
@@ -2290,13 +2290,13 @@
 $(GENDIR)/src/proto/grpc/testing/stats.pb.cc: protoc_dep_error
 $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc: protoc_dep_error
 else
-$(GENDIR)/src/proto/grpc/testing/stats.pb.cc: $(GENDIR)/src/proto/grpc/testing/stats.pb.h
+$(GENDIR)/src/proto/grpc/testing/stats.pb.cc: $(GENDIR)/src/proto/grpc/testing/stats.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/stats.pb.h: src/proto/grpc/testing/stats.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(PROTOC) -I$(PROTOBUF_SRC_DIR) -I. --cpp_out=$(GENDIR) $<
 
-$(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/stats.pb.h
+$(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/stats.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/stats.grpc.pb.h: src/proto/grpc/testing/stats.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) 
 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
 	$(Q) mkdir -p `dirname $@`
@@ -2307,13 +2307,13 @@
 $(GENDIR)/src/proto/grpc/testing/test.pb.cc: protoc_dep_error
 $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc: protoc_dep_error
 else
-$(GENDIR)/src/proto/grpc/testing/test.pb.cc: $(GENDIR)/src/proto/grpc/testing/test.pb.h
+$(GENDIR)/src/proto/grpc/testing/test.pb.cc: $(GENDIR)/src/proto/grpc/testing/test.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/test.pb.h: src/proto/grpc/testing/test.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc
 	$(E) "[PROTOC]  Generating protobuf CC file from $<"
 	$(Q) mkdir -p `dirname $@`
 	$(Q) $(PROTOC) -I$(PROTOBUF_SRC_DIR) -I. --cpp_out=$(GENDIR) $<
 
-$(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/test.pb.h
+$(GENDIR)/src/proto/grpc/testing/test.grpc.pb.cc: $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.h $(GENDIR)/src/proto/grpc/testing/test.pb.h ;
 $(GENDIR)/src/proto/grpc/testing/test.grpc.pb.h: src/proto/grpc/testing/test.proto $(PROTOBUF_DEP) $(PROTOC_PLUGINS) $(GENDIR)/src/proto/grpc/testing/empty.pb.cc $(GENDIR)/src/proto/grpc/testing/empty.grpc.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.pb.cc $(GENDIR)/src/proto/grpc/testing/messages.grpc.pb.cc
 	$(E) "[GRPC]    Generating gRPC's protobuf service CC file from $<"
 	$(Q) mkdir -p `dirname $@`