sync upstream branch

APP_Framework/Applications/Makefile

@@ -1,6 +1,9 @@
-SRC_DIR := general_functions app_test 
+include $(KERNEL_ROOT)/.config
 
-SRC_FILES := main.c framework_init.c 
+ifeq ($(CONFIG_ADD_NUTTX_FETURES),y)
+    include $(APPDIR)/Make.defs
+    CSRCS += framework_init.c
+    include $(APPDIR)/Application.mk
 
 ifeq ($(CONFIG_LIB_LV),y)
 SRC_FILES += lv_init.c
@@ -12,20 +15,30 @@ ifeq ($(CONFIG_APPLICATION_OTA),y)
 	SRC_DIR += ota
 endif
 
-ifeq ($(CONFIG_APPLICATION_SENSOR),y)
-	SRC_DIR += sensor_app
-endif
+ifeq ($(CONFIG_ADD_XIUOS_FETURES),y)
+    SRC_DIR := general_functions app_test 
 
-ifeq ($(CONFIG_APPLICATION_CONNECTION),y)
-	SRC_DIR += connection_app
-endif
+    SRC_FILES := main.c framework_init.c 
 
-ifeq ($(CONFIG_APPLICATION_KNOWING),y)
-	SRC_DIR += knowing_app
-endif
+    ifeq ($(CONFIG_APPLICATION_OTA),y)
+        SRC_DIR += ota
+    endif
 
-ifeq ($(CONFIG_APPLICATION_CONTROL),y)
-	SRC_DIR += control_app
-endif
+    ifeq ($(CONFIG_APPLICATION_SENSOR),y)
+        SRC_DIR += sensor_app
+    endif
 
-include $(KERNEL_ROOT)/compiler.mk
+    ifeq ($(CONFIG_APPLICATION_CONNECTION),y)
+        SRC_DIR += connection_app
+    endif
+
+    ifeq ($(CONFIG_APPLICATION_KNOWING),y)
+        SRC_DIR += knowing_app
+    endif
+
+    ifeq ($(CONFIG_APPLICATION_CONTROL),y)
+        SRC_DIR += control_app
+    endif
+
+    include $(KERNEL_ROOT)/compiler.mk
+endif