diff --git a/Makefile b/Makefile index 35ecd4a1..fe3f9ec1 100644 --- a/Makefile +++ b/Makefile @@ -66,10 +66,13 @@ $(LUA_CLIB_PATH)/netpack.so : lualib-src/lua-netpack.c | $(LUA_CLIB_PATH) $(CC) $(CFLAGS) $(SHARED) $^ -Iskynet-src -o $@ $(LUA_CLIB_PATH)/cjson.so : | $(LUA_CLIB_PATH) - cd 3rd/lua-cjson && $(MAKE) LUA_INCLUDE_DIR=$(LUA_INC) CC=$(CC) CJSON_LDFLAGS="$(SHARED)" && cp cjson.so ../../$@ + cd 3rd/lua-cjson && $(MAKE) LUA_INCLUDE_DIR=../../$(LUA_INC) CC=$(CC) CJSON_LDFLAGS="$(SHARED)" && cp cjson.so ../../$@ $(LUA_CLIB_PATH)/clientsocket.so : lualib-src/lua-clientsocket.c | $(LUA_CLIB_PATH) $(CC) $(CFLAGS) $(SHARED) $^ -o $@ -lpthread clean : rm -f $(SKYNET_BUILD_PATH)/skynet $(CSERVICE_PATH)/*.so $(LUA_CLIB_PATH)/*.so + +cleanall: clean + cd 3rd/lua-cjson && $(MAKE) clean diff --git a/platform.mk b/platform.mk index 11031f89..20dba89c 100644 --- a/platform.mk +++ b/platform.mk @@ -3,7 +3,7 @@ PLATS = linux freebsd macosx CC ?= gcc -.PHONY : none $(PLATS) clean all +.PHONY : none $(PLATS) clean all cleanall ifneq ($(PLAT), none)