Merge branch 'master' of http://172.17.3.10:17001/chenweican/k-sdk

platform/zigbee/app/builder/Z3GatewayHost/Makefile

@@ -87,6 +87,7 @@ INCLUDES= \
   -I./../../../platform/base/hal/micro/unix/host \
   -I../../../platform/base/hal/micro/unix/host/board \
   -I./rpc_api/inc \
+  -I../../../../../common/sqlite/ \
   -I./ZB
  \
 
@@ -375,10 +376,10 @@ $(TARGET_FILE): $(APPLICATION_OBJECTS) $(LIBRARIES)
 else
 $(TARGET_FILE): $(APPLICATION_OBJECTS) $(LIBRARIES)
 ifeq ($(CONFIG_VENDOR),ubuntu)
-	$(LD) $^ $(LINKER_FLAGS)  -lm -L. -lapi_com_ubuntu -lnanomsg_ubuntu -lanl -pthread -lev_ubuntu -lsqlite3 -lkk_hal_ubuntu  -o  $(TARGET_FILE)
+	$(LD) $^ $(LINKER_FLAGS)  -lm -L. -lapi_com_ubuntu -lnanomsg_ubuntu -lanl -pthread -lev_ubuntu -lkk_hal_ubuntu -lsqlite_ubuntu -ldl -o  $(TARGET_FILE)
 	@echo -e '\n$@ build success'
 else
-	$(LD) $^ $(LINKER_FLAGS)  -lm -L. -lapi_com -lnanomsg -lanl -pthread -lev -lkk_hal -lsqlite3 -o  $(TARGET_FILE)
+	$(LD) $^ $(LINKER_FLAGS)  -lm -L. -lapi_com -lnanomsg -lanl -pthread -lev -lkk_hal -lsqlite -o  $(TARGET_FILE)
 	@echo -e '\n$@ build success'
 endif	
 endif

platform/zigbee/makefile

+CONFIG_TPL      := $(CURDIR)/../../../.config
+CONFIG_VENDOR   := $(shell grep -m 1 "VENDOR *:" $(CONFIG_TPL) 2>/dev/null|awk '{ print $$NF }')
+
+export CONFIG_VENDOR
+
 TOP_DIR_ZIGBEE       ?= $(CURDIR)
 ZIGBEE_MAKEFILE_PATH ?= $(TOP_DIR_ZIGBEE)/app/builder/Z3GatewayHost/
+
 all:
 	@cd $(ZIGBEE_MAKEFILE_PATH) && $(MAKE);
\ No newline at end of file