Updating examples to reflect the new state of things.

cpp/helloworld/Makefile

@@ -43,14 +43,17 @@ vpath %.proto $(PROTOS_PATH)
 
 all: system-check greeter_client greeter_server
 
-greeter_client: helloworld.pb.o greeter_client.o
+greeter_client: helloworld.grpc.pb.o helloworld.pb.o greeter_client.o
 	$(CXX) $^ $(LDFLAGS) -o $@
 
 greeter_server: helloworld.pb.o greeter_server.o
 	$(CXX) $^ $(LDFLAGS) -o $@
 
+%.grpc.pb.cc: %.proto
+	$(PROTOC) -I $(PROTOS_PATH) --grpc_out=. --plugin=protoc-gen-grpc=$(GRPC_CPP_PLUGIN_PATH) $<
+
 %.pb.cc: %.proto
-	$(PROTOC) -I $(PROTOS_PATH) --cpp_out=. --grpc_out=. --plugin=protoc-gen-grpc=$(GRPC_CPP_PLUGIN_PATH) $<
+	$(PROTOC) -I $(PROTOS_PATH) --cpp_out=. $<
 
 clean:
 	rm -f *.o *.pb.cc *.pb.h greeter_client greeter_server

cpp/helloworld/greeter_client.cc

@@ -42,7 +42,7 @@
 #include <grpc++/create_channel.h>
 #include <grpc++/credentials.h>
 #include <grpc++/status.h>
-#include "helloworld.pb.h"
+#include "helloworld.grpc.pb.h"
 
 using grpc::ChannelArguments;
 using grpc::ChannelInterface;

cpp/helloworld/greeter_server.cc

@@ -41,7 +41,7 @@
 #include <grpc++/server_context.h>
 #include <grpc++/server_credentials.h>
 #include <grpc++/status.h>
-#include "helloworld.pb.h"
+#include "helloworld.grpc.pb.h"
 
 using grpc::Server;
 using grpc::ServerBuilder;

cpp/route_guide/Makefile

@@ -43,14 +43,17 @@ vpath %.proto $(PROTOS_PATH)
 
 all: system-check route_guide_client route_guide_server
 
-route_guide_client: route_guide.pb.o route_guide_client.o helper.o
+route_guide_client: route_guide.grpc.pb.o route_guide.pb.o route_guide_client.o helper.o
 	$(CXX) $^ $(LDFLAGS) -o $@
 
-route_guide_server: route_guide.pb.o route_guide_server.o helper.o
+route_guide_server: route_guide.grpc.pb.o route_guide.pb.o route_guide_server.o helper.o
 	$(CXX) $^ $(LDFLAGS) -o $@
 
+%.grpc.pb.cc: %.proto
+	$(PROTOC) -I $(PROTOS_PATH) --grpc_out=. --plugin=protoc-gen-grpc=$(GRPC_CPP_PLUGIN_PATH) $<
+
 %.pb.cc: %.proto
-	$(PROTOC) -I $(PROTOS_PATH) --cpp_out=. --grpc_out=. --plugin=protoc-gen-grpc=$(GRPC_CPP_PLUGIN_PATH) $<
+	$(PROTOC) -I $(PROTOS_PATH) --cpp_out=. $<
 
 clean:
 	rm -f *.o *.pb.cc *.pb.h route_guide_client route_guide_server

cpp/route_guide/helper.cc

@@ -38,7 +38,7 @@
 #include <sstream>
 #include <string>
 #include <vector>
-#include "route_guide.pb.h"
+#include "route_guide.grpc.pb.h"
 
 namespace examples {
 

cpp/route_guide/route_guide_client.cc

@@ -47,7 +47,7 @@
 #include <grpc++/status.h>
 #include <grpc++/stream.h>
 #include "helper.h"
-#include "route_guide.pb.h"
+#include "route_guide.grpc.pb.h"
 
 using grpc::ChannelArguments;
 using grpc::ChannelInterface;

cpp/route_guide/route_guide_server.cc

@@ -46,7 +46,7 @@
 #include <grpc++/status.h>
 #include <grpc++/stream.h>
 #include "helper.h"
-#include "route_guide.pb.h"
+#include "route_guide.grpc.pb.h"
 
 using grpc::Server;
 using grpc::ServerBuilder;