From 2126f54d726f45f12b084fe02809d517ee747915 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=91=E9=A3=8E?= <cloudwu@gmail.com>
Date: Wed, 5 Sep 2012 12:22:29 +0800
Subject: [PATCH] move so from lualib to luaclib

---
 Makefile                 | 21 ++++++++++++---------
 skynet-src/skynet_main.c |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 8386e155..45b4254c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,17 +7,17 @@ all : \
   skynet \
   service/snlua.so \
   service/logger.so \
-  lualib/skynet.so \
   service/gate.so \
   service/client.so \
   service/connection.so \
-  client \
-  lualib/socket.so \
-  lualib/int64.so \
   service/master.so \
   service/multicast.so \
   service/tunnel.so \
-  service/harbor.so
+  service/harbor.so \
+  luaclib/skynet.so \
+  luaclib/socket.so \
+  luaclib/int64.so \
+  client
 
 skynet : \
   skynet-src/skynet_main.c \
@@ -34,6 +34,9 @@ skynet : \
   skynet-src/skynet_env.c
 	gcc $(CFLAGS) -Wl,-E -o $@ $^ -Iskynet-src -lpthread -ldl -lrt -Wl,-E -llua -lm
 
+luaclib:
+	mkdir luaclib
+
 service/tunnel.so : service-src/service_tunnel.c
 	gcc $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src
 
@@ -55,7 +58,7 @@ service/snlua.so : service-src/service_lua.c
 service/gate.so : gate/mread.c gate/ringbuffer.c gate/main.c
 	gcc $(CFLAGS) $(SHARED) $^ -o $@ -Igate -Iskynet-src
 
-lualib/skynet.so : lualib-src/lua-skynet.c lualib-src/lua-seri.c lualib-src/lua-remoteobj.c
+luaclib/skynet.so : lualib-src/lua-skynet.c lualib-src/lua-seri.c lualib-src/lua-remoteobj.c | luaclib
 	gcc $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src
 
 service/client.so : service-src/service_client.c
@@ -64,15 +67,15 @@ service/client.so : service-src/service_client.c
 service/connection.so : connection/connection.c connection/main.c
 	gcc $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src -Iconnection
 
-lualib/socket.so : connection/lua-socket.c
+luaclib/socket.so : connection/lua-socket.c | luaclib
 	gcc $(CFLAGS) $(SHARED) $^ -o $@ -Iskynet-src -Iconnection
 
-lualib/int64.so : lua-int64/int64.c
+luaclib/int64.so : lua-int64/int64.c | luaclib
 	gcc $(CFLAGS) $(SHARED) -O2 $^ -o $@ 
 
 client : client-src/client.c
 	gcc $(CFLAGS) $^ -o $@ -lpthread
 
 clean :
-	rm skynet client lualib/*.so service/*.so
+	rm skynet client service/*.so luaclib/*.so
 	
\ No newline at end of file
diff --git a/skynet-src/skynet_main.c b/skynet-src/skynet_main.c
index 607dc7bb..294bca3f 100644
--- a/skynet-src/skynet_main.c
+++ b/skynet-src/skynet_main.c
@@ -96,7 +96,7 @@ main(int argc, char *argv[]) {
 
 	const char *path = optstring("lua_path","./lualib/?.lua;./lualib/?/init.lua");
 	setenv("LUA_PATH",path,1);
-	const char *cpath = optstring("lua_cpath","./lualib/?.so");
+	const char *cpath = optstring("lua_cpath","./luaclib/?.so");
 	setenv("LUA_CPATH",cpath,1);
 	optstring("luaservice","./service/?.lua");