Merge branch 'master' of git://git.denx.de/u-boot-arm

[karo-tx-uboot.git] / lib_generic / Makefile

diff --git a/lib_generic/Makefile b/lib_generic/Makefile
index dca3a6cbdc6122900588f6521d27bebe2e0cbd23..c45f07ca125be1de78117b3e5a235e67be6208b3 100644 (file)
--- a/lib_generic/Makefile
+++ b/lib_generic/Makefile
@@ -25,22 +25,31 @@ include $(TOPDIR)/config.mk
 
 LIB    = $(obj)libgeneric.a
 
-COBJS-y += bzlib.o
-COBJS-y += bzlib_crctable.o
-COBJS-y += bzlib_decompress.o
-COBJS-y += bzlib_randtable.o
-COBJS-y += bzlib_huffman.o
+COBJS-$(CONFIG_ADDR_MAP) += addr_map.o
+COBJS-$(CONFIG_BZIP2) += bzlib.o
+COBJS-$(CONFIG_BZIP2) += bzlib_crctable.o
+COBJS-$(CONFIG_BZIP2) += bzlib_decompress.o
+COBJS-$(CONFIG_BZIP2) += bzlib_randtable.o
+COBJS-$(CONFIG_BZIP2) += bzlib_huffman.o
+COBJS-$(CONFIG_USB_TTY) += circbuf.o
+COBJS-y += crc16.o
 COBJS-y += crc32.o
 COBJS-y += ctype.o
 COBJS-y += display_options.o
 COBJS-y += div64.o
-COBJS-y += lmb.o
+COBJS-$(CONFIG_GZIP) += gunzip.o
+COBJS-$(CONFIG_LMB) += lmb.o
 COBJS-y += ldiv.o
 COBJS-$(CONFIG_MD5) += md5.o
-COBJS-y += sha1.o
+COBJS-y += net_utils.o
+COBJS-$(CONFIG_SHA1) += sha1.o
+COBJS-$(CONFIG_SHA256) += sha256.o
 COBJS-y += string.o
+COBJS-y        += strmhz.o
+COBJS-y += time.o
 COBJS-y += vsprintf.o
-COBJS-y += zlib.o
+COBJS-$(CONFIG_ZLIB) += zlib.o
+COBJS-$(CONFIG_RBTREE) += rbtree.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)