Merge branch 'master' of /home/wd/git/u-boot/custodians

[u-boot] / lib_generic / Makefile

diff --git a/lib_generic/Makefile b/lib_generic/Makefile
index bf0e31d127d5f6fd689463cae1414f26c6ba2b6c..686601cc18932b28c2040490accdfdddd583d2ca 100644 (file)
--- a/lib_generic/Makefile
+++ b/lib_generic/Makefile
@@ -25,15 +25,18 @@ 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-y += crc16.o
 COBJS-y += crc32.o
 COBJS-y += ctype.o
 COBJS-y += display_options.o
 COBJS-y += div64.o
+COBJS-y += gunzip.o
 COBJS-y += lmb.o
 COBJS-y += ldiv.o
 COBJS-$(CONFIG_MD5) += md5.o
@@ -43,6 +46,7 @@ COBJS-y += string.o
 COBJS-y        += strmhz.o
 COBJS-y += vsprintf.o
 COBJS-y += zlib.o
+COBJS-$(CONFIG_RBTREE) += rbtree.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)