From ff0bf6386d702ff9f32528fe6296c8da326c9914 Mon Sep 17 00:00:00 2001
From: Xiang Xiao <xiaoxiang@xiaomi.com>
Date: Sat, 5 Mar 2022 04:00:13 +0800
Subject: [PATCH] chore(lvgl.[h|mk]): don't include the grandchildren file
 (#3145)

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
---
 lvgl.h               | 5 -----
 lvgl.mk              | 3 +--
 src/draw/lv_draw.mk  | 1 +
 src/extra/lv_extra.h | 6 ++++++
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lvgl.h b/lvgl.h
index 0df02ebc9..cafe51c7a 100644
--- a/lvgl.h
+++ b/lvgl.h
@@ -67,11 +67,6 @@ extern "C" {
  * EXTRAS
  *----------------*/
 #include "src/extra/lv_extra.h"
-#include "src/extra/widgets/lv_widgets.h"
-#include "src/extra/layouts/lv_layouts.h"
-#include "src/extra/themes/lv_themes.h"
-#include "src/extra/others/lv_others.h"
-#include "src/extra/libs/lv_libs.h"
 
 /*********************
  *      DEFINES
diff --git a/lvgl.mk b/lvgl.mk
index a57c1d2bb..5a580124d 100644
--- a/lvgl.mk
+++ b/lvgl.mk
@@ -1,9 +1,8 @@
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/demos/lv_demos.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/examples/examples.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/extra/extra.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/core/lv_core.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/lv_draw.mk
-include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/extra/extra.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/font/lv_font.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/hal/lv_hal.mk
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/misc/lv_misc.mk
diff --git a/src/draw/lv_draw.mk b/src/draw/lv_draw.mk
index 803e06494..3394a8985 100644
--- a/src/draw/lv_draw.mk
+++ b/src/draw/lv_draw.mk
@@ -16,3 +16,4 @@ VPATH += :$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw
 CFLAGS += "-I$(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw"
 
 include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sdl/lv_draw_sdl.mk
+include $(LVGL_DIR)/$(LVGL_DIR_NAME)/src/draw/sw/lv_draw_sw.mk
diff --git a/src/extra/lv_extra.h b/src/extra/lv_extra.h
index ea9ce381b..c0306a980 100644
--- a/src/extra/lv_extra.h
+++ b/src/extra/lv_extra.h
@@ -14,6 +14,12 @@ extern "C" {
  *      INCLUDES
  *********************/
 
+#include "layouts/lv_layouts.h"
+#include "libs/lv_libs.h"
+#include "others/lv_others.h"
+#include "themes/lv_themes.h"
+#include "widgets/lv_widgets.h"
+
 /*********************
  *      DEFINES
  *********************/