Merge pull request #179 from yang-g/master

Fix bug in Makefiles
This commit is contained in:
Nicolas Noble 2015-04-13 10:09:51 -07:00
commit 881205b861
2 changed files with 4 additions and 4 deletions

View File

@ -43,10 +43,10 @@ vpath %.proto $(PROTOS_PATH)
all: system-check greeter_client greeter_server all: system-check greeter_client greeter_server
greeter_client: helloworld.grpc.pb.o helloworld.pb.o greeter_client.o greeter_client: helloworld.pb.o helloworld.grpc.pb.o greeter_client.o
$(CXX) $^ $(LDFLAGS) -o $@ $(CXX) $^ $(LDFLAGS) -o $@
greeter_server: helloworld.pb.o greeter_server.o greeter_server: helloworld.pb.o helloworld.grpc.pb.o greeter_server.o
$(CXX) $^ $(LDFLAGS) -o $@ $(CXX) $^ $(LDFLAGS) -o $@
%.grpc.pb.cc: %.proto %.grpc.pb.cc: %.proto

View File

@ -43,10 +43,10 @@ vpath %.proto $(PROTOS_PATH)
all: system-check route_guide_client route_guide_server all: system-check route_guide_client route_guide_server
route_guide_client: route_guide.grpc.pb.o route_guide.pb.o route_guide_client.o helper.o route_guide_client: route_guide.pb.o route_guide.grpc.pb.o route_guide_client.o helper.o
$(CXX) $^ $(LDFLAGS) -o $@ $(CXX) $^ $(LDFLAGS) -o $@
route_guide_server: route_guide.grpc.pb.o route_guide.pb.o route_guide_server.o helper.o route_guide_server: route_guide.pb.o route_guide.grpc.pb.o route_guide_server.o helper.o
$(CXX) $^ $(LDFLAGS) -o $@ $(CXX) $^ $(LDFLAGS) -o $@
%.grpc.pb.cc: %.proto %.grpc.pb.cc: %.proto