From fd5c51f9033eea52ecc6fa397989be97e1150d3f Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Wed, 3 Jun 2020 16:00:56 +0200 Subject: [PATCH] pkg/lvgl: declare module as pseudomodule There's no lvgl module to build with package, only lvgl_xx modules. --- pkg/lvgl/Makefile | 1 - pkg/lvgl/Makefile.include | 3 +++ pkg/lvgl/Makefile.lvgl | 5 ----- 3 files changed, 3 insertions(+), 6 deletions(-) delete mode 100644 pkg/lvgl/Makefile.lvgl diff --git a/pkg/lvgl/Makefile b/pkg/lvgl/Makefile index d7c9eb7017..9048f21aa4 100644 --- a/pkg/lvgl/Makefile +++ b/pkg/lvgl/Makefile @@ -18,7 +18,6 @@ LVGL_MODULES = \ .PHONY: lvgl_% all: $(LVGL_MODULES) - "$(MAKE)" -C $(PKG_BUILDDIR) -f $(CURDIR)/Makefile.$(PKG_NAME) lvgl_%: MODULE=$@ "$(MAKE)" -C $(PKG_BUILDDIR)/src/lv_$* -f $(CURDIR)/Makefile.lvgl_module diff --git a/pkg/lvgl/Makefile.include b/pkg/lvgl/Makefile.include index 004f4b741d..de90f66a1f 100644 --- a/pkg/lvgl/Makefile.include +++ b/pkg/lvgl/Makefile.include @@ -28,3 +28,6 @@ CFLAGS += -DLV_MEM_SIZE=$(LVGL_MEM_SIZE) CFLAGS += -DLVGL_INACTIVITY_PERIOD_MS=$(LVGL_INACTIVITY_PERIOD_MS) CFLAGS += -DLVGL_TASK_HANDLER_DELAY_US=$(LVGL_TASK_HANDLER_DELAY_US) CFLAGS += -DLVGL_TASK_THREAD_PRIO=$(LVGL_TASK_THREAD_PRIO) + +# lvgl module is not a concrete module, so declare it as a pseudomodule +PSEUDOMODULES += lvgl diff --git a/pkg/lvgl/Makefile.lvgl b/pkg/lvgl/Makefile.lvgl deleted file mode 100644 index 90dc7499fd..0000000000 --- a/pkg/lvgl/Makefile.lvgl +++ /dev/null @@ -1,5 +0,0 @@ -MODULE = lvgl - -NO_AUTO_SRC = 1 - -include $(RIOTBASE)/Makefile.base