scb9328: Fix flash warning: type qualifiers ignored on function return type

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

diff --git a/lib_generic/Makefile b/lib_generic/Makefile
index 978e60dcc5116d13ebccbfc33fc80dace4a98df9..9713353ddf7008de55c811c2cb2ac30a9b8ca4d6 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,18 +23,35 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = libgeneric.a
-
-OBJS   = crc32.o ctype.o display_options.o ldiv.o string.o vsprintf.o zlib.o
-
-$(LIB):        .depend $(OBJS)
-       $(AR) crv $@ $(OBJS)
+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-y += crc32.o
+COBJS-y += ctype.o
+COBJS-y += display_options.o
+COBJS-y += div64.o
+COBJS-y += ldiv.o
+COBJS-y += sha1.o
+COBJS-y += string.o
+COBJS-y += vsprintf.o
+COBJS-y += zlib.o
+
+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
 
 #########################################################################