From 5439cc2406d8555bb1419248a97394f39a940ba3 Mon Sep 17 00:00:00 2001
From: leeonix <real-like@yeah.net>
Date: Wed, 13 Aug 2014 22:20:40 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BC=96=E8=AF=91Makefil?=
 =?UTF-8?q?e?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..8ced684
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,53 @@
+
+SHARED := -fPIC --shared
+CFLAGS = -g -O2 -Wall -I$(LUA_INC)
+
+PBC_PATH = ./3rd/pbc
+
+SKYNET_PATH ?= skynet
+LUA_INC ?= $(SKYNET_PATH)/3rd/lua
+LUA_LIB_PATH ?= $(SKYNET_PATH)/lualib
+LUA_CLIB_PATH ?= $(SKYNET_PATH)/luaclib
+CSERVICE_PATH ?= $(SKYNET_PATH)/cservice
+
+ALL_FILE = $(LUA_CLIB_PATH)/protobuf.so $(LUA_LIB_PATH)/protobuf.lua \
+		   $(LUA_CLIB_PATH)/p.so $(LUA_LIB_PATH)/p.lua \
+		   res/talkbox.pb \
+
+all: $(SKYNET_PATH)/skynet pbc $(ALL_FILE)
+	@:
+	
+
+# skynet
+
+$(SKYNET_PATH)/skynet:
+	git submodule update --init
+	cd ./skynet && $(MAKE) linux
+
+# pbc
+
+pbc:
+	cd $(PBC_PATH) && $(MAKE) "CFLAGS = -O2 -fPIC" lib
+
+$(LUA_CLIB_PATH)/protobuf.so: $(PBC_PATH)/binding/lua/pbc-lua.c pbc $(SKYNET_PATH)/skynet
+	gcc $(CFLAGS) $(SHARED) -o $@ -I$(PBC_PATH) -L$(PBC_PATH)/build -lpbc $<
+
+$(LUA_LIB_PATH)/protobuf.lua: $(PBC_PATH)/binding/lua/protobuf.lua $(LUA_CLIB_PATH)/protobuf.so
+	cp -f $< $@
+
+res/talkbox.pb: res/talkbox.proto $(LUA_LIB_PATH)/protobuf.lua $(LUA_CLIB_PATH)/protobuf.so
+	protoc -o $@ $<
+
+$(LUA_CLIB_PATH)/p.so: ./3rd/p/lua-p.c
+	gcc $(CFLAGS) $(SHARED) -o $@ $<
+
+$(LUA_LIB_PATH)/p.lua: ./3rd/p/lua-p.c $(LUA_CLIB_PATH)/p.so
+	cp -f $< $@
+
+clean:
+	rm -f $(ALL_FILE)
+
+cleanall: clean
+	cd $(PBC_PATH) && $(MAKE) clean
+	cd $(SKYNET_PATH) && $(MAKE) clean
+

From c282fe06aff1f241b197175b94e2d96f57f26d04 Mon Sep 17 00:00:00 2001
From: leeonix <real-like@yeah.net>
Date: Wed, 13 Aug 2014 22:48:46 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3PBC=E7=9A=84=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 8ced684..9a499f0 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ SHARED := -fPIC --shared
 CFLAGS = -g -O2 -Wall -I$(LUA_INC)
 
 PBC_PATH = ./3rd/pbc
+PBC_LIB = $(PBC_PATH)/build/libpbc.a
 
 SKYNET_PATH ?= skynet
 LUA_INC ?= $(SKYNET_PATH)/3rd/lua
@@ -10,11 +11,13 @@ LUA_LIB_PATH ?= $(SKYNET_PATH)/lualib
 LUA_CLIB_PATH ?= $(SKYNET_PATH)/luaclib
 CSERVICE_PATH ?= $(SKYNET_PATH)/cservice
 
+RES_PATH = ./res
+
 ALL_FILE = $(LUA_CLIB_PATH)/protobuf.so $(LUA_LIB_PATH)/protobuf.lua \
 		   $(LUA_CLIB_PATH)/p.so $(LUA_LIB_PATH)/p.lua \
-		   res/talkbox.pb \
+		   $(RES_PATH)/talkbox.pb \
 
-all: $(SKYNET_PATH)/skynet pbc $(ALL_FILE)
+all: $(SKYNET_PATH)/skynet $(PBC_LIB) $(ALL_FILE)
 	@:
 	
 
@@ -26,24 +29,24 @@ $(SKYNET_PATH)/skynet:
 
 # pbc
 
-pbc:
+$(PBC_LIB): $(SKYNET_PATH)/skynet
 	cd $(PBC_PATH) && $(MAKE) "CFLAGS = -O2 -fPIC" lib
 
-$(LUA_CLIB_PATH)/protobuf.so: $(PBC_PATH)/binding/lua/pbc-lua.c pbc $(SKYNET_PATH)/skynet
+$(LUA_CLIB_PATH)/protobuf.so: $(PBC_PATH)/binding/lua/pbc-lua.c
 	gcc $(CFLAGS) $(SHARED) -o $@ -I$(PBC_PATH) -L$(PBC_PATH)/build -lpbc $<
 
 $(LUA_LIB_PATH)/protobuf.lua: $(PBC_PATH)/binding/lua/protobuf.lua $(LUA_CLIB_PATH)/protobuf.so
 	cp -f $< $@
 
-res/talkbox.pb: res/talkbox.proto $(LUA_LIB_PATH)/protobuf.lua $(LUA_CLIB_PATH)/protobuf.so
-	protoc -o $@ $<
-
 $(LUA_CLIB_PATH)/p.so: ./3rd/p/lua-p.c
 	gcc $(CFLAGS) $(SHARED) -o $@ $<
 
 $(LUA_LIB_PATH)/p.lua: ./3rd/p/lua-p.c $(LUA_CLIB_PATH)/p.so
 	cp -f $< $@
 
+$(RES_PATH)/talkbox.pb: $(RES_PATH)/talkbox.proto
+	protoc -o $@ $<
+
 clean:
 	rm -f $(ALL_FILE)
 

From 2dbe8e3fd0146591d8d01e419f644a4ffb325d8a Mon Sep 17 00:00:00 2001
From: leeonix <real-like@yeah.net>
Date: Wed, 13 Aug 2014 23:21:47 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9pbc=EF=BC=8C=E7=BC=96?=
 =?UTF-8?q?=E8=AF=91=E4=B8=BA=E6=B2=A1=E6=9C=89-fPIC=E7=9A=84=E3=80=82?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4p.lua=E7=9A=84=E5=A4=8D=E5=88=B6=E3=80=82?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9start.sh?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile |  7 ++-----
 start.sh | 29 ++---------------------------
 2 files changed, 4 insertions(+), 32 deletions(-)
 mode change 100755 => 100644 start.sh

diff --git a/Makefile b/Makefile
index 9a499f0..4738971 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ CSERVICE_PATH ?= $(SKYNET_PATH)/cservice
 RES_PATH = ./res
 
 ALL_FILE = $(LUA_CLIB_PATH)/protobuf.so $(LUA_LIB_PATH)/protobuf.lua \
-		   $(LUA_CLIB_PATH)/p.so $(LUA_LIB_PATH)/p.lua \
+		   $(LUA_CLIB_PATH)/p.so \
 		   $(RES_PATH)/talkbox.pb \
 
 all: $(SKYNET_PATH)/skynet $(PBC_LIB) $(ALL_FILE)
@@ -30,7 +30,7 @@ $(SKYNET_PATH)/skynet:
 # pbc
 
 $(PBC_LIB): $(SKYNET_PATH)/skynet
-	cd $(PBC_PATH) && $(MAKE) "CFLAGS = -O2 -fPIC" lib
+	cd $(PBC_PATH) && $(MAKE) lib
 
 $(LUA_CLIB_PATH)/protobuf.so: $(PBC_PATH)/binding/lua/pbc-lua.c
 	gcc $(CFLAGS) $(SHARED) -o $@ -I$(PBC_PATH) -L$(PBC_PATH)/build -lpbc $<
@@ -41,9 +41,6 @@ $(LUA_LIB_PATH)/protobuf.lua: $(PBC_PATH)/binding/lua/protobuf.lua $(LUA_CLIB_PA
 $(LUA_CLIB_PATH)/p.so: ./3rd/p/lua-p.c
 	gcc $(CFLAGS) $(SHARED) -o $@ $<
 
-$(LUA_LIB_PATH)/p.lua: ./3rd/p/lua-p.c $(LUA_CLIB_PATH)/p.so
-	cp -f $< $@
-
 $(RES_PATH)/talkbox.pb: $(RES_PATH)/talkbox.proto
 	protoc -o $@ $<
 
diff --git a/start.sh b/start.sh
old mode 100755
new mode 100644
index 6eedbaa..6f18ee6
--- a/start.sh
+++ b/start.sh
@@ -52,28 +52,12 @@ run()
 }
 
 echo "  >>---------- 开始 ----------"
-
-git submodule update --init
-
-echo "  >>---------- 处理protocbuf ----------"
-
-# export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
-
-mv ./3rd/pbc/Makefile ./3rd/pbc/Makefile.bak
-mv ./3rd/pbc/binding/lua/Makefile ./3rd/pbc/binding/lua/Makefile.bak
-cp ./3rd/pbcMakefile ./3rd/pbc/Makefile
-cp ./3rd/pbcluaMakefile ./3rd/pbc/binding/lua/Makefile
-
-cd ./3rd/pbc/ && make && cd ./binding/lua/ && make && cd ../../../../
-
-protoc -o ./res/talkbox.pb ./res/talkbox.proto
-
-echo "  >>---------- 处理协议 ----------"
-cd ./3rd/p/ && gcc -g -O2 -Wall -I../../skynet/3rd/lua   -fPIC --shared ./lua-p.c -o ./p.so && cd ../../
+make
 
 echo "  >>---------- 进入skynet目录 ----------"
 echo ""
 cd ${SKYNET_PATH};
+
 #日志目录
 LOG_PATH="../log/"
 if [ ! -x "$LOG_PATH" ]; then
@@ -85,15 +69,6 @@ TMP_PATH="../tmp/"
 if [ ! -x "$TMP_PATH" ]; then
 	mkdir "$TMP_PATH"
 fi
-echo ""
-echo "  >>---------- 编译 ----------"
-echo ""
-make linux;
-echo ""
-echo "  >>---------- 拷贝协议so模块 ----------"
-cp -f ../3rd/pbc/binding/lua/protobuf.lua ./lualib/ && cp -f ../3rd/pbc/binding/lua/protobuf.so ./luaclib/
-cp -f ../3rd/p/p.so ./luaclib/
-
 
 echo ""
 echo "  >>---------- 执行 ---------"

From 1afc344110a8618fa70b136ddb96f98eb6e6f169 Mon Sep 17 00:00:00 2001
From: leeonix <real-like@yeah.net>
Date: Thu, 14 Aug 2014 01:32:30 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 4738971..5269ed7 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ PBC_LIB = $(PBC_PATH)/build/libpbc.a
 
 SKYNET_PATH ?= skynet
 LUA_INC ?= $(SKYNET_PATH)/3rd/lua
+
 LUA_LIB_PATH ?= $(SKYNET_PATH)/lualib
 LUA_CLIB_PATH ?= $(SKYNET_PATH)/luaclib
 CSERVICE_PATH ?= $(SKYNET_PATH)/cservice
@@ -17,30 +18,35 @@ ALL_FILE = $(LUA_CLIB_PATH)/protobuf.so $(LUA_LIB_PATH)/protobuf.lua \
 		   $(LUA_CLIB_PATH)/p.so \
 		   $(RES_PATH)/talkbox.pb \
 
-all: $(SKYNET_PATH)/skynet $(PBC_LIB) $(ALL_FILE)
+all: $(PBC_LIB) $(SKYNET_PATH)/skynet $(ALL_FILE)
 	@:
 	
+# pbc
 
-# skynet
-
-$(SKYNET_PATH)/skynet:
+$(PBC_LIB):
 	git submodule update --init
-	cd ./skynet && $(MAKE) linux
+	cd $(PBC_PATH) && $(MAKE) lib "CFLAGS = -O2 -fPIC"
 
-# pbc
+# skynet
+
+$(SKYNET_PATH)/skynet: $(PBC_LIB)
+	cd $(SKYNET_PATH) && $(MAKE) linux
 
-$(PBC_LIB): $(SKYNET_PATH)/skynet
-	cd $(PBC_PATH) && $(MAKE) lib
+# pbc-lua
 
 $(LUA_CLIB_PATH)/protobuf.so: $(PBC_PATH)/binding/lua/pbc-lua.c
-	gcc $(CFLAGS) $(SHARED) -o $@ -I$(PBC_PATH) -L$(PBC_PATH)/build -lpbc $<
+	gcc $(CFLAGS) $(SHARED) -o $@ -I$(PBC_PATH) $< $(PBC_LIB)
 
 $(LUA_LIB_PATH)/protobuf.lua: $(PBC_PATH)/binding/lua/protobuf.lua $(LUA_CLIB_PATH)/protobuf.so
 	cp -f $< $@
 
+# pack
+
 $(LUA_CLIB_PATH)/p.so: ./3rd/p/lua-p.c
 	gcc $(CFLAGS) $(SHARED) -o $@ $<
 
+# proto file
+
 $(RES_PATH)/talkbox.pb: $(RES_PATH)/talkbox.proto
 	protoc -o $@ $<
 

From e6e38914ebafab457ed14603b88ee23ebdc118a4 Mon Sep 17 00:00:00 2001
From: leeonix <real-like@yeah.net>
Date: Thu, 14 Aug 2014 10:10:07 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0CC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 5269ed7..3350c31 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,6 @@
 
-SHARED := -fPIC --shared
+CC = gcc # or clang
+SHARED = -fPIC -shared
 CFLAGS = -g -O2 -Wall -I$(LUA_INC)
 
 PBC_PATH = ./3rd/pbc
@@ -10,6 +11,7 @@ LUA_INC ?= $(SKYNET_PATH)/3rd/lua
 
 LUA_LIB_PATH ?= $(SKYNET_PATH)/lualib
 LUA_CLIB_PATH ?= $(SKYNET_PATH)/luaclib
+SERVICE_PATH ?= $(SKYNET_PATH)/service
 CSERVICE_PATH ?= $(SKYNET_PATH)/cservice
 
 RES_PATH = ./res
@@ -20,22 +22,22 @@ ALL_FILE = $(LUA_CLIB_PATH)/protobuf.so $(LUA_LIB_PATH)/protobuf.lua \
 
 all: $(PBC_LIB) $(SKYNET_PATH)/skynet $(ALL_FILE)
 	@:
-	
+
 # pbc
 
 $(PBC_LIB):
 	git submodule update --init
-	cd $(PBC_PATH) && $(MAKE) lib "CFLAGS = -O2 -fPIC"
+	cd $(PBC_PATH) && $(MAKE) lib CC=$(CC) CFLAGS="-O2 -fPIC"
 
 # skynet
 
 $(SKYNET_PATH)/skynet: $(PBC_LIB)
-	cd $(SKYNET_PATH) && $(MAKE) linux
+	cd $(SKYNET_PATH) && $(MAKE) linux CC=$(CC)
 
 # pbc-lua
 
 $(LUA_CLIB_PATH)/protobuf.so: $(PBC_PATH)/binding/lua/pbc-lua.c
-	gcc $(CFLAGS) $(SHARED) -o $@ -I$(PBC_PATH) $< $(PBC_LIB)
+	$(CC) $(CFLAGS) $(SHARED) -o $@ -I$(PBC_PATH) $< $(PBC_LIB)
 
 $(LUA_LIB_PATH)/protobuf.lua: $(PBC_PATH)/binding/lua/protobuf.lua $(LUA_CLIB_PATH)/protobuf.so
 	cp -f $< $@
@@ -43,7 +45,7 @@ $(LUA_LIB_PATH)/protobuf.lua: $(PBC_PATH)/binding/lua/protobuf.lua $(LUA_CLIB_PA
 # pack
 
 $(LUA_CLIB_PATH)/p.so: ./3rd/p/lua-p.c
-	gcc $(CFLAGS) $(SHARED) -o $@ $<
+	$(CC) $(CFLAGS) $(SHARED) -o $@ $<
 
 # proto file