summaryrefslogtreecommitdiff
path: root/fs/jffs2/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <[email protected]>2008-09-01 00:16:29 +0200
committerWolfgang Denk <[email protected]>2008-09-01 00:16:29 +0200
commite99e9575bbeba1b7c48e046547cae065ec0071de (patch)
treec08553c4d06725bd6013a46068df0059c5b49a00 /fs/jffs2/Makefile
parenta13b2d937941f6b525abfcfad96c034f94421188 (diff)
parent08ab4e1780fa63c88dd5a5ab52f4ff4ed1ee1878 (diff)
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'fs/jffs2/Makefile')
-rw-r--r--fs/jffs2/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/fs/jffs2/Makefile b/fs/jffs2/Makefile
index a071af1f6e5..fd6a1050c67 100644
--- a/fs/jffs2/Makefile
+++ b/fs/jffs2/Makefile
@@ -26,13 +26,15 @@ include $(TOPDIR)/config.mk
LIB = $(obj)libjffs2.a
AOBJS =
-COBJS-y += jffs2_1pass.o
+ifdef CONFIG_CMD_JFFS2
+COBJS-$(CONFIG_JFFS2_LZO_LZARI) += compr_lzari.o
+COBJS-$(CONFIG_JFFS2_LZO_LZARI) += 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
-COBJS-y += compr_lzo.o
-COBJS-y += compr_lzari.o
+endif
COBJS := $(COBJS-y)
SRCS := $(AOBJS:.o=.S) $(COBJS:.o=.c)