From 72bc5647960e0ec6cc9e8b5889acdf68f346286f Mon Sep 17 00:00:00 2001
From: Yang Gao <yangg@google.com>
Date: Thu, 19 Feb 2015 14:45:41 -0800
Subject: [PATCH] Resolve comments on makefile

---
 cpp/helloworld/Makefile | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/cpp/helloworld/Makefile b/cpp/helloworld/Makefile
index 38f4ff081fd..7211aa5cbe2 100644
--- a/cpp/helloworld/Makefile
+++ b/cpp/helloworld/Makefile
@@ -29,19 +29,28 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-CC=g++
-CCFLAGS=-I/usr/local/include -std=c++11
-LDFLAGS=-L/usr/local/lib -lgrpc -lgrpc++ -lprotobuf -ldl
+CXX=g++
+CPPFLAGS=-I/usr/local/include -pthread
+CXXFLAGS=-std=c++11
+LDFLAGS=-L/usr/local/lib -lgrpc -lgrpc++ -lprotobuf -lpthread -ldl
 
 all: greeter_client greeter_server
 
-greeter_client: helloworld.pb.cc greeter_client.cc
-	$(CC) $(CCFLAGS) greeter_client.cc helloworld.pb.cc $(LDFLAGS) -o greeter_client.out
+helloworld.o: helloworld.pb.cc
+	$(CXX) -c $(CXXFLAGS) $^
 
+greeter_client.o: greeter_client.cc
+	$(CXX) -c $(CXXFLAGS) $^
 
-greeter_server: helloworld.pb.cc greeter_server.cc
-	$(CC) $(CCFLAGS) greeter_server.cc helloworld.pb.cc $(LDFLAGS) -o greeter_server.out
+greeter_server.o: greeter_server.cc
+	$(CXX) -c $(CXXFLAGS) $^
+
+greeter_client: helloworld.pb.o greeter_client.o
+	$(CXX) $(CPPFLAGS) $^ $(LDFLAGS) -o $@
+
+greeter_server: helloworld.pb.o greeter_server.o
+	$(CXX) $(CPPFLAGS) $^ $(LDFLAGS) -o $@
 
 clean:
-	rm *.out
+	rm -f *.o greeter_client greeter_server