improve makefile

4 files changed, 72 insertions, 17 deletions

diff --git a/core/src/demo/makefile b/core/src/demo/makefile
index b01fa0ded..d576cd93e 100644
--- a/core/src/demo/makefile
+++ b/core/src/demo/makefile
@@ -1,27 +1,63 @@
-# preifx
 include $(PRO_DIR)/prefix.mak
 
-# module name
-NAMES 											= demo
+NAMES 				= demo
+demo_TYPE 			= BIN
+demo_C_FILES 		+= xmake
+demo_PKGS-$(BASE)  	+= base
+demo_CXFLAGS 		+= -D__tb_prefix__=\"xmake\"
 
-# type
-demo_TYPE 										= BIN
+demo_LIBS 			+= xmake$(DTYPE)
+demo_LIB_DIRS 		+= ../xmake
 
-# files
-demo_C_FILES 									+= xmake
+# lcurses
+demo_LIBS 			+= lcurses$(DTYPE)
+demo_LIB_DIRS 		+= ../lcurses
 
-# packages
-demo_PKGS-$(BASE)  								+= base
+# tbox
+tbox_DTYPE 			:= $(if $(findstring tbox,$(base_LIBNAMES)),,$(DTYPE))
+demo_LIBS 			+= tbox$(tbox_DTYPE)
+demo_INC_DIRS 		+= ../ ../tbox/tbox/src ../tbox/inc/$(PLAT)
+demo_LIB_DIRS 	    += ../tbox
 
-# debug suffix
-tbox_DTYPE 										:= $(if $(findstring tbox,$(base_LIBNAMES)),,$(DTYPE))
+# luajit
+ifndef LUAJIT_LIBS
+LUAJIT_LIBS 		:= luajit$(DTYPE)
+endif
+ifndef LUAJIT_INC_DIRS
+LUAJIT_INC_DIRS 	:= ../luajit/luajit/src
+endif
+ifndef LUAJIT_LIB_DIRS
+LUAJIT_LIB_DIRS 	:= ../luajit
+endif
+demo_LIBS 			+= $(LUAJIT_LIBS)
+demo_INC_DIRS 	    += $(LUAJIT_INC_DIRS)
+demo_LIB_DIRS 		+= $(LUAJIT_LIB_DIRS)
 
-# others
-demo_LIBS 										+= xmake$(DTYPE) lcurses$(DTYPE) tbox$(tbox_DTYPE) luajit$(DTYPE) sv$(DTYPE) lua-cjson$(DTYPE) $(BASE_LIBS)
-demo_INC_DIRS 									+= ../ ../tbox/tbox/src ../tbox/inc/$(PLAT) ../luajit/luajit/src ../sv/sv/include
-demo_LIB_DIRS 									+= ../xmake ../tbox ../luajit ../sv ../lcurses ../lua-cjson
-demo_CXFLAGS 									+= -D__tb_prefix__=\"xmake\"
+# sv
+ifndef LIBSV_LIBS
+LIBSV_LIBS 			:= sv$(DTYPE)
+endif
+ifndef LIBSV_INC_DIRS
+LIBSV_INC_DIRS 		:= ../sv/sv/include
+endif
+ifndef LIBSV_LIB_DIRS
+LIBSV_LIB_DIRS 		:= ../sv
+endif
+demo_LIBS 			+= $(LIBSV_LIBS)
+demo_INC_DIRS 		+= $(LIBSV_INC_DIRS)
+demo_LIB_DIRS 		+= $(LIBSV_LIB_DIRS)
+
+# lua-cjson
+ifndef LUA_CJSON_LIBS
+LUA_CJSON_LIBS 		:= lua-cjson$(DTYPE)
+endif
+ifndef LUA_CJSON_LIB_DIRS
+LUA_CJSON_LIB_DIRS 	:= ../lua-cjson
+endif
+demo_LIBS 			+= $(LUA_CJSON_LIBS)
+demo_LIB_DIRS 		+= $(LUA_CJSON_LIB_DIRS)
+
+demo_LIBS 			+= $(BASE_LIBS)
 
-# suffix
 include $(PRO_DIR)/suffix.mak
 
diff --git a/core/src/lua-cjson/makefile b/core/src/lua-cjson/makefile
index b9b132553..9d45a3bd4 100644
--- a/core/src/lua-cjson/makefile
+++ b/core/src/lua-cjson/makefile
@@ -25,6 +25,12 @@ lua-cjson_CFLAGS 		+= -DNDEBUG -DUSE_INTERNAL_FPCONV
 lua-cjson_INC_DIRS 		+= \
 						../luajit/luajit/src
 
+# use system luajit library?
+ifdef LUA_CJSON_LIBS
+lua-cjson_C_FILES 		:=
+lua-cjson_INC_DIRS 		:=
+endif
+
 # suffix
 include $(PRO_DIR)/suffix.mak
 
diff --git a/core/src/luajit/makefile b/core/src/luajit/makefile
index fa63cc67c..fc05a2883 100644
--- a/core/src/luajit/makefile
+++ b/core/src/luajit/makefile
@@ -137,6 +137,14 @@ luajit_CXFLAGS 			+= -fPIE
 endif
 endif
 
+# use system luajit library?
+ifdef LUAJIT_LIBS
+luajit_C_FILES 			:=
+luajit_ASM_FILES 		:=
+luajit_INC_FILES 		:=
+luajit_OBJ_FILES 		:=
+endif
+
 # suffix
 include $(PRO_DIR)/suffix.mak
 
diff --git a/core/src/sv/makefile b/core/src/sv/makefile
index e9d77de6f..535f4c0b0 100644
--- a/core/src/sv/makefile
+++ b/core/src/sv/makefile
@@ -23,6 +23,11 @@ sv_C_FILES 				+= \
 # includes
 sv_INC_DIRS  			+= sv/include
 
+# use system luajit library?
+ifdef LIBSV_LIBS
+sv_C_FILES 				:=
+sv_INC_DIRS 			:=
+endif
 
 # suffix
 include $(PRO_DIR)/suffix.mak