From 811e2e742e64cdc4bfb9519c0d0db53ac75aa4ce Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 7 Jun 2011 02:19:03 -0400 Subject: jffs2: make lzo optional at build time The external lzo dep can be a pain to deal with when cross-compiling, so make it optional for jffs2. This is useful if people aren't even using the functionality, or for quicker development. Signed-off-by: Mike Frysinger Signed-off-by: Artem Bityutskiy --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 6a65258..8bdba8e 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,11 @@ CPPFLAGS += -I./include $(ZLIBCPPFLAGS) $(LZOCPPFLAGS) ifeq ($(WITHOUT_XATTR), 1) CPPFLAGS += -DWITHOUT_XATTR endif +ifeq ($(WITHOUT_LZO), 1) + CPPFLAGS += -DWITHOUT_LZO +else + LZOLDLIBS = -llzo2 +endif SUBDIRS = lib ubi-utils mkfs.ubifs TESTS = tests @@ -48,11 +53,11 @@ $(BUILDDIR)/mkfs.jffs2: $(addprefix $(BUILDDIR)/,\ compr_rtime.o mkfs.jffs2.o compr_zlib.o compr_lzo.o \ compr.o rbtree.o) LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS) -LDLIBS_mkfs.jffs2 = -lz -llzo2 +LDLIBS_mkfs.jffs2 = -lz $(LZOLDLIBS) $(BUILDDIR)/jffs2reader: $(BUILDDIR)/jffs2reader.o LDFLAGS_jffs2reader = $(ZLIBLDFLAGS) $(LZOLDFLAGS) -LDLIBS_jffs2reader = -lz -llzo2 +LDLIBS_jffs2reader = -lz $(LZOLDLIBS) $(BUILDDIR)/lib/libmtd.a: subdirs_lib_all ; -- cgit v1.2.3