i386: Fix link collisions resulting from gcc4.4.1 upgrade

[u-boot] / fs / reiserfs / Makefile

diff --git a/fs/reiserfs/Makefile b/fs/reiserfs/Makefile
index 45028cb15e58cba372a96f1ae3dd4d39cb4a3be1..9cef8ee91076723a71b86089a4c60c40fb031952 100644 (file)
--- a/fs/reiserfs/Makefile
+++ b/fs/reiserfs/Makefile
@@ -30,17 +30,17 @@ include $(TOPDIR)/config.mk
 LIB    = $(obj)libreiserfs.a
 
 AOBJS  =
-COBJS  = reiserfs.o dev.o mode_string.o
+COBJS-$(CONFIG_CMD_REISER) := reiserfs.o dev.o mode_string.o
 
-SRCS   := $(AOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS   := $(addprefix $(obj),$(AOBJS) $(COBJS))
+SRCS   := $(AOBJS:.o=.S) $(COBJS-y:.o=.c)
+OBJS   := $(addprefix $(obj),$(AOBJS) $(COBJS-y))
 
 #CPPFLAGS +=
 
 all:   $(LIB) $(AOBJS)
 
 $(LIB):        $(obj).depend $(OBJS)
-       $(AR) crv $@ $(OBJS)
+       $(AR) $(ARFLAGS) $@ $(OBJS)
 
 #########################################################################