@@ -17,3 +17,10 @@ obj-y += swupdate.o \
pctl.o \
state.o \
syslog.o \
+ installer.o \
+ network_thread.o \
+ stream_interface.o \
+ progress_thread.o \
+ parsing_library.o \
+ artifacts_versions.o \
+ swupdate_dict.o
similarity index 100%
rename from corelib/artifacts_versions.c
rename to core/artifacts_versions.c
similarity index 100%
rename from corelib/installer.c
rename to core/installer.c
similarity index 100%
rename from corelib/network_thread.c
rename to core/network_thread.c
similarity index 100%
rename from corelib/parsing_library.c
rename to core/parsing_library.c
similarity index 100%
rename from corelib/progress_thread.c
rename to core/progress_thread.c
similarity index 100%
rename from corelib/stream_interface.c
rename to core/stream_interface.c
similarity index 100%
rename from corelib/swupdate_dict.c
rename to core/swupdate_dict.c
@@ -2,13 +2,6 @@
#
# SPDX-License-Identifier: GPL-2.0-or-later
-lib-y += installer.o \
- network_thread.o \
- stream_interface.o \
- progress_thread.o \
- parsing_library.o \
- artifacts_versions.o \
- swupdate_dict.o
lib-$(CONFIG_DOWNLOAD) += downloader.o
lib-$(CONFIG_MTD) += mtd-interface.o
lib-$(CONFIG_LUA) += lua_interface.o lua_compat.o
core and corelib have the following meaning: - core contains modules that are always built into SWUpdate. - corelib contains central components that can be enabled/disabled via Kconfig. During the development, the original meaning was lost and corelib contains components that cannot be disabled. Clean up this and move fix components into the core directory. Signed-off-by: Stefano Babic <sbabic@denx.de> --- core/Makefile | 7 +++++++ {corelib => core}/artifacts_versions.c | 0 {corelib => core}/installer.c | 0 {corelib => core}/network_thread.c | 0 {corelib => core}/parsing_library.c | 0 {corelib => core}/progress_thread.c | 0 {corelib => core}/stream_interface.c | 0 {corelib => core}/swupdate_dict.c | 0 corelib/Makefile | 7 ------- 9 files changed, 7 insertions(+), 7 deletions(-) rename {corelib => core}/artifacts_versions.c (100%) rename {corelib => core}/installer.c (100%) rename {corelib => core}/network_thread.c (100%) rename {corelib => core}/parsing_library.c (100%) rename {corelib => core}/progress_thread.c (100%) rename {corelib => core}/stream_interface.c (100%) rename {corelib => core}/swupdate_dict.c (100%)