Fix examples for OMAP3 boards...

[pandora-u-boot.git] / lib_generic / Makefile

diff --git a/lib_generic/Makefile b/lib_generic/Makefile
index 18c41b1..686601c 100644 (file)
--- a/lib_generic/Makefile
+++ b/lib_generic/Makefile
@@ -1,5 +1,5 @@
 #
-# (C) Copyright 2000-2002
+# (C) Copyright 2000-2006
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 #
 # See file CREDITS for list of people who contributed to this
@@ -23,21 +23,43 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = libgeneric.a
+LIB    = $(obj)libgeneric.a
 
-OBJS   = bzlib.o bzlib_crctable.o bzlib_decompress.o \
-         bzlib_randtable.o bzlib_huffman.o \
-         crc32.o ctype.o display_options.o ldiv.o \
-         string.o vsprintf.o zlib.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
+COBJS-y += sha1.o
+COBJS-$(CONFIG_SHA256) += sha256.o
+COBJS-y += string.o
+COBJS-y        += strmhz.o
+COBJS-y += vsprintf.o
+COBJS-y += zlib.o
+COBJS-$(CONFIG_RBTREE) += rbtree.o
 
-$(LIB):        .depend $(OBJS)
-       $(AR) crv $@ $(OBJS)
+COBJS  := $(COBJS-y)
+SRCS   := $(COBJS:.o=.c)
+OBJS   := $(addprefix $(obj),$(COBJS))
+
+$(LIB):        $(obj).depend $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
 
 #########################################################################
 
-.depend:       Makefile $(OBJS:.o=.c)
-               $(CC) -M $(CFLAGS) $(OBJS:.o=.c) > $@
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
 
-sinclude .depend
+sinclude $(obj).depend
 
 #########################################################################