合并代码

app/main/main.c

 #include "main.h"
-#include "wifi_autoconfig.h"
 
 int main()
 {

app/main/main.h

@@ -6,6 +6,7 @@
 #include "drivers_common.h"
 #include "modules_common.h"
 #include "pthread_open.h"
+#include "wifi_autoconfig.h"
 
 /*设备id读取初始化*/
 int device_id_file_init();

build/Makefile

@@ -521,6 +521,30 @@ app/main/pthread_open.c.s:
 	$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/app/main/pthread_open.c.s
 .PHONY : app/main/pthread_open.c.s
 
+app/main/wifi_autoconfig.o: app/main/wifi_autoconfig.c.o
+.PHONY : app/main/wifi_autoconfig.o
+
+# target to build an object file
+app/main/wifi_autoconfig.c.o:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/app/main/wifi_autoconfig.c.o
+.PHONY : app/main/wifi_autoconfig.c.o
+
+app/main/wifi_autoconfig.i: app/main/wifi_autoconfig.c.i
+.PHONY : app/main/wifi_autoconfig.i
+
+# target to preprocess a source file
+app/main/wifi_autoconfig.c.i:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/app/main/wifi_autoconfig.c.i
+.PHONY : app/main/wifi_autoconfig.c.i
+
+app/main/wifi_autoconfig.s: app/main/wifi_autoconfig.c.s
+.PHONY : app/main/wifi_autoconfig.s
+
+# target to generate assembly for a file
+app/main/wifi_autoconfig.c.s:
+	$(MAKE) $(MAKESILENT) -f CMakeFiles/main.dir/build.make CMakeFiles/main.dir/app/main/wifi_autoconfig.c.s
+.PHONY : app/main/wifi_autoconfig.c.s
+
 drivers/devicecontrol/car0101_control.o: drivers/devicecontrol/car0101_control.c.o
 .PHONY : drivers/devicecontrol/car0101_control.o
 
@@ -2129,6 +2153,9 @@ help:
 	@echo "... app/main/pthread_open.o"
 	@echo "... app/main/pthread_open.i"
 	@echo "... app/main/pthread_open.s"
+	@echo "... app/main/wifi_autoconfig.o"
+	@echo "... app/main/wifi_autoconfig.i"
+	@echo "... app/main/wifi_autoconfig.s"
 	@echo "... drivers/devicecontrol/car0101_control.o"
 	@echo "... drivers/devicecontrol/car0101_control.i"
 	@echo "... drivers/devicecontrol/car0101_control.s"

build/third_party/mosquitto/lib/CMakeFiles/libmosquitto.dir/progress.make

@@ -35,11 +35,11 @@ CMAKE_PROGRESS_34 =
 CMAKE_PROGRESS_35 = 
 CMAKE_PROGRESS_36 = 12
 CMAKE_PROGRESS_37 = 
-CMAKE_PROGRESS_38 = 13
-CMAKE_PROGRESS_39 = 
+CMAKE_PROGRESS_38 = 
+CMAKE_PROGRESS_39 = 13
 CMAKE_PROGRESS_40 = 
-CMAKE_PROGRESS_41 = 14
-CMAKE_PROGRESS_42 = 
+CMAKE_PROGRESS_41 = 
+CMAKE_PROGRESS_42 = 14
 CMAKE_PROGRESS_43 = 
 CMAKE_PROGRESS_44 = 15
 

build/third_party/mosquitto/lib/CMakeFiles/libmosquitto_static.dir/progress.make

@@ -26,17 +26,17 @@ CMAKE_PROGRESS_25 =
 CMAKE_PROGRESS_26 = 
 CMAKE_PROGRESS_27 = 24
 CMAKE_PROGRESS_28 = 
-CMAKE_PROGRESS_29 = 25
-CMAKE_PROGRESS_30 = 
+CMAKE_PROGRESS_29 = 
+CMAKE_PROGRESS_30 = 25
 CMAKE_PROGRESS_31 = 
-CMAKE_PROGRESS_32 = 26
-CMAKE_PROGRESS_33 = 
+CMAKE_PROGRESS_32 = 
+CMAKE_PROGRESS_33 = 26
 CMAKE_PROGRESS_34 = 
-CMAKE_PROGRESS_35 = 27
-CMAKE_PROGRESS_36 = 
+CMAKE_PROGRESS_35 = 
+CMAKE_PROGRESS_36 = 27
 CMAKE_PROGRESS_37 = 
-CMAKE_PROGRESS_38 = 28
-CMAKE_PROGRESS_39 = 
+CMAKE_PROGRESS_38 = 
+CMAKE_PROGRESS_39 = 28
 CMAKE_PROGRESS_40 = 
 CMAKE_PROGRESS_41 = 29
 CMAKE_PROGRESS_42 = 

build/third_party/mosquitto/plugins/dynamic-security/CMakeFiles/mosquitto_dynamic_security.dir/progress.make

 CMAKE_PROGRESS_1 = 
-CMAKE_PROGRESS_2 = 
-CMAKE_PROGRESS_3 = 86
+CMAKE_PROGRESS_2 = 86
+CMAKE_PROGRESS_3 = 
 CMAKE_PROGRESS_4 = 
-CMAKE_PROGRESS_5 = 
-CMAKE_PROGRESS_6 = 87
+CMAKE_PROGRESS_5 = 87
+CMAKE_PROGRESS_6 = 
 CMAKE_PROGRESS_7 = 
 CMAKE_PROGRESS_8 = 88
 CMAKE_PROGRESS_9 = 

build/third_party/mosquitto/src/CMakeFiles/mosquitto.dir/progress.make

@@ -5,20 +5,20 @@ CMAKE_PROGRESS_4 =
 CMAKE_PROGRESS_5 = 
 CMAKE_PROGRESS_6 = 57
 CMAKE_PROGRESS_7 = 
-CMAKE_PROGRESS_8 = 
-CMAKE_PROGRESS_9 = 58
+CMAKE_PROGRESS_8 = 58
+CMAKE_PROGRESS_9 = 
 CMAKE_PROGRESS_10 = 
-CMAKE_PROGRESS_11 = 
-CMAKE_PROGRESS_12 = 59
+CMAKE_PROGRESS_11 = 59
+CMAKE_PROGRESS_12 = 
 CMAKE_PROGRESS_13 = 
-CMAKE_PROGRESS_14 = 
-CMAKE_PROGRESS_15 = 60
+CMAKE_PROGRESS_14 = 60
+CMAKE_PROGRESS_15 = 
 CMAKE_PROGRESS_16 = 
-CMAKE_PROGRESS_17 = 
-CMAKE_PROGRESS_18 = 61
+CMAKE_PROGRESS_17 = 61
+CMAKE_PROGRESS_18 = 
 CMAKE_PROGRESS_19 = 
-CMAKE_PROGRESS_20 = 
-CMAKE_PROGRESS_21 = 62
+CMAKE_PROGRESS_20 = 62
+CMAKE_PROGRESS_21 = 
 CMAKE_PROGRESS_22 = 
 CMAKE_PROGRESS_23 = 63
 CMAKE_PROGRESS_24 = 
@@ -46,14 +46,14 @@ CMAKE_PROGRESS_45 =
 CMAKE_PROGRESS_46 = 
 CMAKE_PROGRESS_47 = 71
 CMAKE_PROGRESS_48 = 
-CMAKE_PROGRESS_49 = 
-CMAKE_PROGRESS_50 = 72
+CMAKE_PROGRESS_49 = 72
+CMAKE_PROGRESS_50 = 
 CMAKE_PROGRESS_51 = 
-CMAKE_PROGRESS_52 = 
-CMAKE_PROGRESS_53 = 73
+CMAKE_PROGRESS_52 = 73
+CMAKE_PROGRESS_53 = 
 CMAKE_PROGRESS_54 = 
-CMAKE_PROGRESS_55 = 
-CMAKE_PROGRESS_56 = 74
+CMAKE_PROGRESS_55 = 74
+CMAKE_PROGRESS_56 = 
 CMAKE_PROGRESS_57 = 
 CMAKE_PROGRESS_58 = 75
 CMAKE_PROGRESS_59 =