--- Makefile.orig	Mon May 13 10:25:58 2002
+++ Makefile	Wed Oct  8 17:14:29 2003
@@ -5,11 +5,9 @@
 
 CFLAGS += -I../include -O2 -Wall
 
-TARGETS = ftl_format erase eraseall nftldump nanddump doc_loadbios \
-nftl_format mkfs.jffs ftl_check nandtest nandwrite mkfs.jffs2 lock unlock \
-einfo mtd_debug fcp jffs2reader
+TARGETS = mkfs.jffs2 jffs2reader
 
-SYMLINKS = crc32.h crc32.c compr_rtime.c compr_rubin.c compr.c pushpull.h histo_mips.h compr_rubin.h
+SYMLINKS = crc32.h crc32.c compr_rtime.c compr_rubin.c compr.c pushpull.c pushpull.h histo_mips.h compr_rubin.h
 
 all: $(TARGETS)
 
@@ -22,11 +20,11 @@ compr_rubin.o: pushpull.h histo_mips.h c
 $(SYMLINKS):
 	ln -sf ../fs/jffs2/$@ $@
 
-mkfs.jffs2: crc32.o compr_rtime.o compr_rubin.o compr.o mkfs.jffs2.o compr_zlib.o
+mkfs.jffs2: crc32.o compr_rtime.o compr_rubin.o compr.o mkfs.jffs2.o compr_zlib.o pushpull.o
 	$(CC) -o $@ $^ -lz
 
 compr.o: compr.c
-	$(CC) $(CFLAGS) -Dprintk=printf -DKERN_NOTICE= -c -o $@ $<
+	$(CC) $(CFLAGS) -Dprintk=printf -DKERN_NOTICE= -DKERN_WARNING= -Dzlib_compress=jffs2_zlib_compress -Dzlib_decompress=jffs2_zlib_decompress -c -o $@ $<
 
 jffs2reader: jffs2reader.c
 	$(CC) $(CFLAGS) jffs2reader.c -o jffs2reader -lz