From a36cc962a3201f29b998d6d779192de6134582de Mon Sep 17 00:00:00 2001
From: suda-morris <362953310@qq.com>
Date: Fri, 23 Aug 2019 12:51:05 +0800
Subject: [PATCH] smartconfig: move smartconfig_ack to esp_wifi conponent

---
 components/esp_wifi/CMakeLists.txt                             | 3 ++-
 .../{smartconfig_ack => esp_wifi}/include/smartconfig_ack.h    | 0
 components/{smartconfig_ack => esp_wifi/src}/smartconfig_ack.c | 0
 components/smartconfig_ack/CMakeLists.txt                      | 3 ---
 components/smartconfig_ack/component.mk                        | 2 --
 5 files changed, 2 insertions(+), 6 deletions(-)
 rename components/{smartconfig_ack => esp_wifi}/include/smartconfig_ack.h (100%)
 rename components/{smartconfig_ack => esp_wifi/src}/smartconfig_ack.c (100%)
 delete mode 100644 components/smartconfig_ack/CMakeLists.txt
 delete mode 100644 components/smartconfig_ack/component.mk

diff --git a/components/esp_wifi/CMakeLists.txt b/components/esp_wifi/CMakeLists.txt
index 925704f93..3b0e3d530 100644
--- a/components/esp_wifi/CMakeLists.txt
+++ b/components/esp_wifi/CMakeLists.txt
@@ -10,9 +10,10 @@ idf_component_register(SRCS "src/coexist.c"
                             "src/phy_init.c"
                             "src/restore.c"
                             "src/smartconfig.c"
+                            "src/smartconfig_ack.c"
                             "src/wifi_init.c"
                     INCLUDE_DIRS "include" "${idf_target}/include"
-                    PRIV_REQUIRES wpa_supplicant nvs_flash smartconfig_ack
+                    PRIV_REQUIRES wpa_supplicant nvs_flash
                     LDFRAGMENTS "${ldfragments}")
 
 idf_build_get_property(build_dir BUILD_DIR)
diff --git a/components/smartconfig_ack/include/smartconfig_ack.h b/components/esp_wifi/include/smartconfig_ack.h
similarity index 100%
rename from components/smartconfig_ack/include/smartconfig_ack.h
rename to components/esp_wifi/include/smartconfig_ack.h
diff --git a/components/smartconfig_ack/smartconfig_ack.c b/components/esp_wifi/src/smartconfig_ack.c
similarity index 100%
rename from components/smartconfig_ack/smartconfig_ack.c
rename to components/esp_wifi/src/smartconfig_ack.c
diff --git a/components/smartconfig_ack/CMakeLists.txt b/components/smartconfig_ack/CMakeLists.txt
deleted file mode 100644
index eb34b0713..000000000
--- a/components/smartconfig_ack/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-idf_component_register(SRCS "smartconfig_ack.c"
-                    INCLUDE_DIRS include
-                    PRIV_REQUIRES lwip tcpip_adapter)
\ No newline at end of file
diff --git a/components/smartconfig_ack/component.mk b/components/smartconfig_ack/component.mk
deleted file mode 100644
index 58eac9a55..000000000
--- a/components/smartconfig_ack/component.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-#
-# Component Makefile