From 76308730fe25e2cc2ee84469f227cbc11b2b9a59 Mon Sep 17 00:00:00 2001
From: gwdwyy <wuyanyi09@gmail.com>
Date: Fri, 2 Aug 2013 20:52:35 +0800
Subject: [PATCH] update makefile

---
 Makefile     | 33 +++++++++++++++++++++++----------
 src/Makefile |  1 -
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 69ecac6..70e89cf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,22 @@
-CC = g++
-CCOPT = -Wall -c
-LINK = g++
-LINKOPT =
-PACKA = ar
-PARCAOPT = rc
-DOLINK = $(LINK) $(LINKOPT) -o $@ $^
+CXX    := g++
+LD     := g++
+AR     := ar rc
+
+INCS := -I. -I./cppcommon
+
+DEBUG_CXXFLAGS     := -g -Wall -DDEBUG 
+RELEASE_CXXFLAGS   := -Wall -O3
+
+ifeq (YES, ${DEBUG})
+   CXXFLAGS       := ${DEBUG_CXXFLAGS}
+   LDFLAGS      := ${DEBUG_LDFLAGS}
+else
+   CXXFLAGS     := ${RELEASE_CXXFLAGS}
+   LDFLAGS      := ${RELEASE_LDFLAGS}
+endif
+
+DOLINK := $(LD) $(LDFLAGS) 
+DOPACK := $(AR)  
 SOURCES := $(wildcard *.cpp)
 OBJS := $(patsubst %.cpp,%.o,$(SOURCES))
 
@@ -21,20 +33,21 @@ all: demo
 # This is a suffix rule 
 #.c.o: 
 %.o: %.cpp
-	$(CC) $(CCOPT) $<
+	$(CXX) -c $(CXXFLAGS) $<
 
 demo: $(OBJS) $(SRCLIB)
-	$(DOLINK) 
+	$(DOLINK) -o $@ $^
 
 $(SRCLIB): 
 	cd $(SRCDIR) && $(MAKE)
 
 clean:
 	rm -f *.o *.ut demo
+	cd $(SRCDIR) && make clean
 
 sinclude $(SOURCES:.cpp=.d)
 %.d:%.cpp
 	@set -e; rm -f $@; \
-	$(CC) -MM $< > $@.$$$$; \
+	$(CXX) -MM $< > $@.$$$$; \
 	sed 's,\($*\).o[ :]*,\1.o $@ : ,g' < $@.$$$$ > $@; \
 	rm -f $@.$$$$
diff --git a/src/Makefile b/src/Makefile
index ec7cd9b..9de50cf 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,4 +1,3 @@
-
 CXX    := g++
 LD     := g++
 AR     := ar rc