Change mbtk_source_v2
Change-Id: I0699762ab517b43060aad43fec0d87c2bfc1445d
diff --git a/mbtk/libmbtk_lib/Makefile b/mbtk/libmbtk_lib/Makefile
index 8183ffd..679250b 100755
--- a/mbtk/libmbtk_lib/Makefile
+++ b/mbtk/libmbtk_lib/Makefile
@@ -4,17 +4,31 @@
LOCAL_PATH=$(BUILD_ROOT)/libmbtk_lib
INC_DIR += \
- -I$(LOCAL_PATH)/inc
+ -I$(LOCAL_PATH)/audio \
+ -I$(LOCAL_PATH)/coap \
+ -I$(LOCAL_PATH)/common \
+ -I$(LOCAL_PATH)/ecall \
+ -I$(LOCAL_PATH)/fota \
+ -I$(LOCAL_PATH)/ftp \
+ -I$(LOCAL_PATH)/gnss \
+ -I$(LOCAL_PATH)/http \
+ -I$(LOCAL_PATH)/mqtt \
+ -I$(LOCAL_PATH)/mqtt/MQTTPacket \
+ -I$(LOCAL_PATH)/net \
+ -I$(LOCAL_PATH)/tcpip \
+ -I$(LOCAL_PATH)/ril
LIB_DIR +=
-LIBS += -llog -lubus -lubox -luci -lprop2uci -lrilutil -lblobmsg_json -ldl
+LIBS += -llog -lubus -lubox -luci -lprop2uci -lrilutil -lblobmsg_json -ldl -lcutils -laudio-apu -lssl -lcrypto
+ifeq ($(BUILD_LIB_TYPE), shared)
CFLAGS += -shared -Wl,-shared,-Bsymbolic
+endif
DEFINE += -DMBTK_NET_MONITOR_SUPPORT
-MY_FILES_PATH:=$(LOCAL_PATH)/src
+#MY_FILES_PATH:=$(LOCAL_PATH)/src
#ifeq ($(CONFIG_MBTK_QL_SUPPORT),y)
#MY_FILES_PATH += $(LOCAL_PATH)/ql
#endif
@@ -29,34 +43,108 @@
#MY_SRC_LIST := $(MY_SRC_LIST:$(LOCAL_PATH)/%=%)
#LOCAL_SRC_FILES += $(MY_SRC_LIST)
-LOCAL_SRC_FILES = src/ds_ASBuffer.cpp \
- src/ds_ASString.cpp \
- src/mbtk_at.c \
- src/mbtk_bs_position.c \
- src/mbtk_file.c \
- src/mbtk_list.c \
- src/mbtk_log.c \
- src/mbtk_map.c \
- src/mbtk_ntp.c \
- src/mbtk_queue.c \
- src/mbtk_str.c \
- src/mbtk_task.c \
- src/mbtk_utf.c \
- src/mbtk_utils.c \
- src/ringbuffer.c \
- src/mbtk_mtd.c \
- src/mbtk_device_info.c \
- src/mbtk_version.c \
- src/mbtk_gpio.c
+# common
+LOCAL_SRC_FILES = \
+ common/ds_ASBuffer.cpp \
+ common/ds_ASString.cpp \
+ common/mbtk_at.c \
+ common/mbtk_bs_position.c \
+ common/mbtk_file.c \
+ common/mbtk_list.c \
+ common/mbtk_log.c \
+ common/mbtk_map.c \
+ common/mbtk_ntp.c \
+ common/mbtk_queue.c \
+ common/mbtk_str.c \
+ common/mbtk_task.c \
+ common/mbtk_utf.c \
+ common/mbtk_utils.c \
+ common/ringbuffer.c \
+ common/mbtk_mtd.c \
+ common/mbtk_device_info.c \
+ common/mbtk_version.c \
+ common/mbtk_gpio.c \
+ common/mbtk_adc.c \
+ common/mbtk_debug.c
-ifeq ($(MBTK_DUMP_SUPPORT), y)
-LOCAL_SRC_FILES += src/mbtk_debug.c
-endif
+# audio
+LOCAL_SRC_FILES += \
+ audio/mbtk_audio.c \
+ audio/mbtk_audio_gain.c \
+ audio/mbtk_pcm_stream.c \
+ audio/mbtk_wav.c \
+ audio/mbtk_audio_ubus.c
+
+# coap
+LOCAL_SRC_FILES += \
+ coap/mbtk_coap.c \
+ coap/mbtk_coap_api.cpp \
+ coap/mbtk_coap_pdu.cpp
+
+# fota
+LOCAL_SRC_FILES += \
+ fota/mbtk_fota.c
+
+# gnss
+LOCAL_SRC_FILES += \
+ gnss/mbtk_gnss.c
+
+# net
+LOCAL_SRC_FILES += \
+ net/mbtk_dhcp.c \
+ net/mbtk_ifc.c \
+ net/mbtk_net_control.c \
+ net/mbtk_sock.c \
+ net/mbtk_sock2.c
+
+# ril
+LOCAL_SRC_FILES += \
+ ril/mbtk_info.c \
+ ril/mbtk_info_api.c \
+ ril/mbtk_pdu_sms.c
+
+# ftp
+LOCAL_SRC_FILES += \
+ ftp/mbtk_ftp.c \
+ ftp/mbtk_ftp_at.c
+
+# http
+LOCAL_SRC_FILES += \
+ http/mbtk_http.c \
+ http/mbtk_http_base.c \
+ http/mbtk_http_chunks.c
+
+# mqtt
+LOCAL_SRC_FILES += \
+ mqtt/mbtk_mqtt.c \
+ mqtt/MQTTClient.c \
+ mqtt/MQTTLinux.c \
+ mqtt/MQTTPacket/core_sha1.c \
+ mqtt/MQTTPacket/core_sha256.c \
+ mqtt/MQTTPacket/MQTTConnectClient.c \
+ mqtt/MQTTPacket/MQTTConnectServer.c \
+ mqtt/MQTTPacket/MQTTDeserializePublish.c \
+ mqtt/MQTTPacket/MQTTFormat.c \
+ mqtt/MQTTPacket/MQTTPacket.c \
+ mqtt/MQTTPacket/MQTTSerializePublish.c \
+ mqtt/MQTTPacket/MQTTSubscribeClient.c \
+ mqtt/MQTTPacket/MQTTSubscribeServer.c \
+ mqtt/MQTTPacket/MQTTUnsubscribeClient.c \
+ mqtt/MQTTPacket/MQTTUnsubscribeServer.c
+
+# tcpip
+LOCAL_SRC_FILES += \
+ tcpip/mbtk_tcpip_at.c
+
OBJS = $(patsubst %.c, %.o, $(patsubst %.cpp, %.o, $(LOCAL_SRC_FILES)))
$(info OBJS = $(OBJS))
+ifeq ($(BUILD_LIB_TYPE), shared)
dtarget := $(OUT_DIR)/lib/libmbtk_lib.so
+else
+dtarget := $(OUT_DIR)/lib/libmbtk_lib.a
+endif
all: $(dtarget)