From fdc36977b33e2e801866ef3279e98bd12bc07b4d Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 18 Nov 2013 11:17:30 +0900 Subject: [PATCH] Makefile: move some libraries to lib/Makefile Signed-off-by: Masahiro Yamada --- Makefile | 5 ----- lib/Makefile | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ed2864cbeb..52133a5434 100644 --- a/Makefile +++ b/Makefile @@ -231,11 +231,6 @@ OBJS := $(addprefix $(obj),$(OBJS)) HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n) LIBS-y += lib/ -LIBS-$(CONFIG_RSA) += lib/rsa/ -LIBS-$(CONFIG_LZMA) += lib/lzma/ -LIBS-$(CONFIG_LZO) += lib/lzo/ -LIBS-$(CONFIG_ZLIB) += lib/zlib/ -LIBS-$(CONFIG_TIZEN) += lib/tizen/ LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/ LIBS-y += $(CPUDIR)/ ifdef SOC diff --git a/lib/Makefile b/lib/Makefile index 4e3b500f5a..e787f77be8 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -6,6 +6,13 @@ # ifndef CONFIG_SPL_BUILD + +obj-$(CONFIG_RSA) += rsa/ +obj-$(CONFIG_LZMA) += lzma/ +obj-$(CONFIG_LZO) += lzo/ +obj-$(CONFIG_ZLIB) += zlib/ +obj-$(CONFIG_TIZEN) += tizen/ + obj-$(CONFIG_AES) += aes.o obj-$(CONFIG_BZIP2) += bzlib.o obj-$(CONFIG_BZIP2) += bzlib_crctable.o -- 2.25.1