Switch from archive libraries to partial linking

[people/ms/u-boot.git] / fs / jffs2 / Makefile

diff --git a/fs/jffs2/Makefile b/fs/jffs2/Makefile
index c1357d0aa5caa40347dbd1d9a653c4c9646412ca..6db6145d2dd1bc497a46536a0f6f39970249e7c3 100644 (file)
--- a/fs/jffs2/Makefile
+++ b/fs/jffs2/Makefile
@@ -23,12 +23,19 @@
 
 include $(TOPDIR)/config.mk
 
-LIB    = $(obj)libjffs2.a
+LIB    = $(obj)libjffs2.o
 
 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) $(ARFLAGS) $@ $(OBJS)
+       $(call cmd_link_o_target, $(OBJS))
 
 
 #########################################################################