【修改内容】调整动态库链接方式

【提交人】陈伟灿

application/kcloud/iot.mk

@@ -10,9 +10,8 @@ CFLAGS 			+= -I$(TOP_DIR)/common/api
 CFLAGS 			+= -I$(TOP_DIR)/common/json
 CFLAGS 			+= -I$(TOP_DIR)/common/nanomsg/include
 CFLAGS 			+= -I$(TOP_DIR)/common/ev/include
-CFLAGS 			+= -I$(TOP_DIR)/common/sqlite
-LDFLAGS         += -lapi_com -lkk_tsl 
-
+LDFLAGS         += -lkk_tsl 
+LDFLAGS         += -lapi_com
 ifeq ($(CONFIG_VENDOR),ubuntu)
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_ubuntu
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_ubuntu  
@@ -20,8 +19,7 @@ else
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev  
 endif
-LDFLAGS         += -L$(TOP_DIR)/output/release/lib -lapi_com
-LDFLAGS         += -liot_cjson -liot_mqtt -lsqlite -ldl -lm -lanl -lkk_hal 
+LDFLAGS         += -liot_cjson -liot_mqtt -ldl -lm -lanl -lkk_hal -lzlog
 
 
 

common/api/iot.mk

 LIBSO_TARGET 		:= libapi_com.so
-LIBA_TARGET 		:= libapi_com.a
 
 CFLAGS 			+= -I$(TOP_DIR)/common/nanomsg/include
 CFLAGS 			+= -I$(TOP_DIR)/common/ev/include
-LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -static -lnanomsg
-LDFLAGS         += -L$(TOP_DIR)/common/ev -static -lev  
+
+ifeq ($(CONFIG_VENDOR),ubuntu)
+	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_ubuntu
+	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_ubuntu  
+else
+	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg
+	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev  
+endif
 LDFLAGS         += -ldl
\ No newline at end of file

common/sqlite/iot.mk

-LIBA_TARGET 		:= libsqlite.a
+LIBSO_TARGET 		:= libsqlite.so
 
 LDFLAGS         += -ldl 
\ No newline at end of file

common/zlog/iot.mk

 LIBSO_TARGET 		:= libzlog.so
-LIBA_TARGET 		:= libzlog.a
+#LIBA_TARGET 		:= libzlog.a
 

midware/midware/iot.mk

@@ -11,7 +11,7 @@ CFLAGS 			+= -I$(TOP_DIR)/common/sqlite
 CFLAGS 			+= -I$(TOP_DIR)/common/zlog
 CFLAGS 			+= -I$(TOP_DIR)/src/tsl/tsl_handle
 LDFLAGS         += -lapi_com -liot_cjson -lkk_tsl
-LDFLAGS         += -lsqlite -ldl -lm  -lkk_hal 
+LDFLAGS         += -ldl -lm  -lkk_hal -lzlog
 ifeq ($(CONFIG_VENDOR),ubuntu)
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg_ubuntu -lanl
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev_ubuntu  
@@ -19,3 +19,4 @@ else
 	LDFLAGS         += -L$(TOP_DIR)/common/nanomsg -lnanomsg -lanl
 	LDFLAGS         += -L$(TOP_DIR)/common/ev  -lev  
 endif
+LDFLAGS         += -lsqlite 
\ No newline at end of file

tools/build-rules/scripts/gen_one_makefile.sh

@@ -206,7 +206,7 @@ for i in ${ALL_PROG}; do
     cat << EOB >> ${TARGET_FILE}
 ${OUTPUT_DIR}/usr/bin/${i}: \\
     ${EXTRA_SRCS} \\
-$(for m in ${j} ${OUTPUT_DIR}/usr/lib/${COMP_LIB} ${ALL_LIBS} ${ALL_LIBSO}; do
+$(for m in ${j} ${OUTPUT_DIR}/usr/lib/${COMP_LIB} ${ALL_LIBS}; do
     echo "    ${m} \\"|sed 's!//*!/!g';
 done)