From 1170acc792a6c7dd5a2a9ac968c133393a508b4f Mon Sep 17 00:00:00 2001
From: Cloud Wu <cloudwu@gmail.com>
Date: Mon, 28 Apr 2014 14:31:51 +0800
Subject: [PATCH] fix makefile for better platform support

---
 Makefile    |  4 +++-
 platform.mk | 16 ++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 28361727..efd0231f 100644
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,8 @@ all : jemalloc
 	
 .PHONY : jemalloc
 
+MALLOC_STATICLIB := $(JEMALLOC_STATICLIB)
+
 $(JEMALLOC_STATICLIB) : 3rd/jemalloc/Makefile
 	cd 3rd/jemalloc && $(MAKE) CC=$(CC) 
 
@@ -52,7 +54,7 @@ all : \
   $(foreach v, $(LUA_CLIB), $(LUA_CLIB_PATH)/$(v).so) 
 
 $(SKYNET_BUILD_PATH)/skynet : $(foreach v, $(SKYNET_SRC), skynet-src/$(v)) $(LUA_LIB) $(MALLOC_STATICLIB)
-	$(CC) $(CFLAGS) -o $@ $^ -Iskynet-src -I$(JEMALLOC_INC) $(LDFLAGS) $(EXPORT) $(LIBS) $(SKYNET_DEFINES)
+	$(CC) $(CFLAGS) -o $@ $^ -Iskynet-src -I$(JEMALLOC_INC) $(LDFLAGS) $(EXPORT) $(SKYNET_LIBS) $(SKYNET_DEFINES)
 
 $(LUA_CLIB_PATH) :
 	mkdir $(LUA_CLIB_PATH)
diff --git a/platform.mk b/platform.mk
index 9bbdb8a3..eddebad0 100644
--- a/platform.mk
+++ b/platform.mk
@@ -5,33 +5,33 @@ CC ?= gcc
 
 .PHONY : none $(PLATS) clean all cleanall
 
-ifneq ($(PLAT), none)
+#ifneq ($(PLAT), none)
 
 .PHONY : default
 
 default :
 	$(MAKE) $(PLAT)
 
-endif
+#endif
 
 none :
 	@echo "Please do 'make PLATFORM' where PLATFORM is one of these:"
 	@echo "   $(PLATS)"
 
-LIBS := -lpthread -lm
+SKYNET_LIBS := -lpthread -lm
 SHARED := -fPIC --shared
 EXPORT := -Wl,-E
 
-$(PLATS) : all 
-
 linux : PLAT = linux
 macosx : PLAT = macosx
 freebsd : PLAT = freebsd
 
-macosx linux : LIBS += -ldl
 macosx : SHARED := -fPIC -dynamiclib -Wl,-undefined,dynamic_lookup
 macosx : EXPORT :=
 macosx : MALLOC_STATICLIB :=
 macosx : SKYNET_DEFINES :=-DNOUSE_JEMALLOC
-linux freebsd : LIBS += -lrt
-linux freebsd : MALLOC_STATICLIB = $(JEMALLOC_STATICLIB)
+macosx linux : SKYNET_LIBS += -ldl
+linux freebsd : SKYNET_LIBS += -lrt
+
+linux macosx freebsd :
+	$(MAKE) all PLAT=$@ SKYNET_LIBS="$(SKYNET_LIBS)" SHARED="$(SHARED)" EXPORT="$(EXPORT)" MALLOC_STATICLIB="$(MALLOC_STATICLIB)" SKYNET_DEFINES="$(SKYNET_DEFINES)"