summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2013-11-11 14:35:52 +0900
committerTom Rini <trini@ti.com>2013-11-17 14:11:30 -0500
commit164922bd7c383a2c82739f8b080b2e0da801ec0d (patch)
tree3ccdfc39750a6ca085e60df5d07bc17de9d732ab
parent7b6af41ef342199e4967735ea17424b42ed742d2 (diff)
lib: descend into sub directories only when it is necessary
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
-rw-r--r--Makefile8
-rw-r--r--lib/lzma/Makefile2
-rw-r--r--lib/lzo/Makefile2
-rw-r--r--lib/rsa/Makefile4
-rw-r--r--lib/zlib/Makefile2
5 files changed, 8 insertions, 10 deletions
diff --git a/Makefile b/Makefile
index 1f499c5ec87..e12f1807f47 100644
--- a/Makefile
+++ b/Makefile
@@ -232,10 +232,10 @@ OBJS := $(addprefix $(obj),$(OBJS))
HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n)
LIBS-y += lib/libgeneric.o
-LIBS-y += lib/rsa/librsa.o
-LIBS-y += lib/lzma/liblzma.o
-LIBS-y += lib/lzo/liblzo.o
-LIBS-y += lib/zlib/libz.o
+LIBS-$(CONFIG_RSA) += lib/rsa/librsa.o
+LIBS-$(CONFIG_LZMA) += lib/lzma/liblzma.o
+LIBS-$(CONFIG_LZO) += lib/lzo/liblzo.o
+LIBS-$(CONFIG_ZLIB) += lib/zlib/libz.o
LIBS-$(CONFIG_TIZEN) += lib/tizen/libtizen.o
LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/lib$(VENDOR).o
LIBS-y += $(CPUDIR)/lib$(CPU).o
diff --git a/lib/lzma/Makefile b/lib/lzma/Makefile
index 25c6797fb60..f8eda06c9f5 100644
--- a/lib/lzma/Makefile
+++ b/lib/lzma/Makefile
@@ -10,4 +10,4 @@
CFLAGS += -D_LZMA_PROB32
-obj-$(CONFIG_LZMA) += LzmaDec.o LzmaTools.o
+obj-y += LzmaDec.o LzmaTools.o
diff --git a/lib/lzo/Makefile b/lib/lzo/Makefile
index dd853eae231..2936544abc0 100644
--- a/lib/lzo/Makefile
+++ b/lib/lzo/Makefile
@@ -5,4 +5,4 @@
# SPDX-License-Identifier: GPL-2.0+
#
-obj-$(CONFIG_LZO) += lzo1x_decompress.o
+obj-y += lzo1x_decompress.o
diff --git a/lib/rsa/Makefile b/lib/rsa/Makefile
index 693c745514a..164ab399645 100644
--- a/lib/rsa/Makefile
+++ b/lib/rsa/Makefile
@@ -7,6 +7,4 @@
# SPDX-License-Identifier: GPL-2.0+
#
-ifdef CONFIG_FIT_SIGNATURE
-obj-$(CONFIG_RSA) += rsa-verify.o
-endif
+obj-$(CONFIG_FIT_SIGNATURE) += rsa-verify.o
diff --git a/lib/zlib/Makefile b/lib/zlib/Makefile
index 1e9e04d9915..2fba95f438d 100644
--- a/lib/zlib/Makefile
+++ b/lib/zlib/Makefile
@@ -5,4 +5,4 @@
# SPDX-License-Identifier: GPL-2.0+
#
-obj-$(CONFIG_ZLIB) += zlib.o
+obj-y += zlib.o