X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=fs%2Fjffs2%2FMakefile;h=7c9fb41b8d64c2698eca4c5dd683cb5eebdf6a65;hb=ebd0d062acdf4dcd26ee0e6a47e16032e1eba75b;hp=82436bbfec910ebbe002484f9f45d0853d362aaa;hpb=504b5cd0e2e7b58c6265fb684a850a158c85e1b2;p=u-boot

diff --git a/fs/jffs2/Makefile b/fs/jffs2/Makefile
index 82436bbfec..7c9fb41b8d 100644
--- a/fs/jffs2/Makefile
+++ b/fs/jffs2/Makefile
@@ -26,9 +26,16 @@ include $(TOPDIR)/config.mk
 LIB	= $(obj)libjffs2.a
 
 AOBJS	=
-COBJS	= jffs2_1pass.o compr_rtime.o compr_rubin.o compr_zlib.o mini_inflate.o
-COBJS	+= compr_lzo.o compr_lzari.o
-
+ifdef CONFIG_CMD_JFFS2
+COBJS-$(CONFIG_JFFS2_LZO) += compr_lzo.o
+COBJS-y += compr_rtime.o
+COBJS-y += compr_rubin.o
+COBJS-y += compr_zlib.o
+COBJS-y += jffs2_1pass.o
+COBJS-y += mini_inflate.o
+endif
+
+COBJS	:= $(COBJS-y)
 SRCS	:= $(AOBJS:.o=.S) $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(AOBJS) $(COBJS))
 
@@ -37,7 +44,7 @@ OBJS	:= $(addprefix $(obj),$(AOBJS) $(COBJS))
 all:	$(LIB) $(AOBJS)
 
 $(LIB):	$(obj).depend $(OBJS)
-	$(AR) crv $@ $(OBJS)
+	$(AR) $(ARFLAGS) $@ $(OBJS)
 
 
 #########################################################################