diff -uNr ../ztelnet/zmodem/Makefile ./zmodem/Makefile
--- ../ztelnet/zmodem/Makefile	Wed Sep 20 00:20:41 1995
+++ ./zmodem/Makefile	Wed Dec  3 05:48:19 1997
@@ -1,142 +1,19 @@
-# Makefile for Unix/Xenix rz and sz programs
-# the makefile is not too well tested yet
-CFLAGS= -c -O
-OBJS=sz.o rz.o
-SRCS= rbsb.c minirb.c zm.c zmr.c crctab.c crc.c zmodem.h
-ARCFILES= README rbsb.c gz *.t minirb.c zmodem.h \
-	zm.c zmr.c crctab.c sz.c rz.c mailer.rz crc.c
+LIB=    librzsz.a
+SRCS=  rz.c sz.c
 
-nothing:
-	@echo
-	@echo "Please study the #ifdef's in crctab.c, rbsb.c, rz.c and sz.c,"
-	@echo "make any necessary hacks for oddball or merged SYSV/BSD systems,"
-	@echo "then type 'make SYSTEM' where SYSTEM is one of:"
-	@echo
-	@echo "	posix	POSIX compliant systems"
-	@echo "	linux	LINUX systems"
-	@echo "	odt	SCO Open Desktop"
-	@echo "	sysvr4	SYSTEM 5.4 Unix, SCO Open Desktop"
-	@echo "	sysvr3	SYSTEM 5.3 Unix with mkdir(2)"
-	@echo "	sysv	SYSTEM 3/5 Unix"
-	@echo "	xenix	Xenix"
-	@echo "	x386	386 Xenix"
-	@echo "	bsd	Berkeley 4.x BSD, Ultrix, V7"
-	@echo "	tandy	Tandy 6000 Xenix"
-	@echo "	dnix	DIAB Dnix 5.2"
-	@echo "	dnix5r3	DIAB Dnix 5.3"
-	@echo "	amiga	3000UX running SVR4"
-	@echo "	POSIX	POSIX compliant systems (SCO Open Desktop, strict)"
-	@echo
-	@echo "	doc	Format the man pages with nroff"
-	@echo
+OBJS=  rz.o sz.o \
+	${LIB_OBJ}
 
-usenet:doc
-	shar -c -a -n rzsz -o /tmp/rzsz -l64 \
-	  README Makefile zmodem.h zm.c rz.c rbsb.c \
-	 crc.c crctab.c minirb.c mailer.rz zmr.c *.doc gz sz.c *.t 
+CFLAGS= -O2 ${DEFINES} ${INCLUDES}
 
-shar:doc
-	shar -c README Makefile zmodem.h zm.c \
-	 zmr.c sz.c rz.c crctab.c \
-	 mailer.rz crc.c rbsb.c minirb.c *.doc gz *.t >/tmp/rzsz 
+${LIB}: ${OBJS}
+	rm -f ${LIB}
+	${AR} ${ARFLAGS} ${LIB} `lorder ${OBJS} | tsort`
+	@if [ ${RANLIB} != NONE ]; \
+		then echo ${RANLIB} ${LIB}; ${RANLIB} ${LIB}; fi
 
-unixforum: shar
-	compress /tmp/rzsz.sh
+clean cleandir:
+	rm -f *.o ${LIB} core a.out
 
-unix:
-	undos $(ARCFILES)
-
-dos:
-	todos $(ARCFILES)
-
-doc:rz.doc sz.doc crc.doc minirb.doc
-
-minirb.doc:minirb.1
-	nroff -man minirb.1 | col  >minirb.doc
-
-rz.doc:rz.1
-	nroff -man rz.1 | col  >rz.doc
-
-sz.doc:sz.1
-	nroff -man sz.1 | col  >sz.doc
-
-crc.doc:crc.1
-	nroff -man crc.1 | col  >crc.doc
-
-zoo: doc
-	-rm -f /tmp/rzsz.zoo
-	zoo ah /tmp/rzsz README Makefile zmodem.h zm.c sz.c rz.c \
-	 mailer.rz crctab.c rbsb.c *.doc \
-	 zmr.c crc.c gz *.t minirb.c
-	touch /tmp/rzsz.zoo
-	chmod og-w /tmp/rzsz.zoo
-	mv /tmp/rzsz.zoo /u/t/yam
-	-rm -f rzsz.zip
-	zip rzsz readme mailer.rz makefile zmodem.h zm.c sz.c rz.c
-	zip rzsz crctab.c rbsb.c *.doc
-	zip rzsz zmr.c crc.c gz *.t minirb.c
-	mv rzsz.zip /u/t/yam
-
-tar:doc
-	tar cvf /tmp/rzsz.tar README Makefile zmodem.h zm.c sz.c rz.c \
-	 mailer.rz crctab.c rbsb.c \
-	 zmr.c crc.c *.1 *.doc gz *.t minirb.c
-
-tags:
-	ctags sz.c rz.c zm.c zmr.c rbsb.c
-
-clean:
-	rm -f *.o
-
-xenix: 
-	$(CC) $(CFLAGS) -M0 -K -i -DUSG -DNFGVMIN -DREADCHECK sz.c
-	$(CC) $(CFLAGS) -M0 -K -i -DUSG -DMD rz.c
-
-x386:
-	$(CC) $(CFLAGS) -DUSG -DMD sz.c 
-	$(CC) $(CFLAGS) -DUSG -DNFGVMIN -DREADCHECK rz.c
-
-sysv:
-	$(CC) $(CFLAGS) -DUSG -DMD sz.c
-	$(CC) $(CFLAGS) -DUSG -DSV -DNFGVMIN rz.c
-
-sysvr3 ultrix3.1:
-	$(CC) $(CFLAGS) -DUSG -DMD=2 sz.c
-	$(CC) $(CFLAGS) -DSV -DUSG -DNFGVMIN rz.c
-
-sysvr4 ultrix4.0:
-	$(CC) $(CFLAGS) -DUSG -DMD=2 sz.c
-	$(CC) $(CFLAGS) -DSV -DUSG rz.c
-
-odt:
-	$(CC) $(CFLAGS) -strict -W2 -n -DUSG -DMD=2 sz.c
-	$(CC) $(CFLAGS) -strict -W2 -n -DUSG -DREADCHECK rz.c
-
-linux posix:
-	$(CC) $(CFLAGS) -DPOSIX -DMD=2 sz.c
-	$(CC) $(CFLAGS) -DPOSIX rz.c
-
-POSIX:
-	@echo "Well, stricter, as in *safer sex* ..."
-	$(CC) $(CFLAGS) -posix -W2 -DPOSIX -DMD=2 sz.c
-	$(CC) $(CFLAGS) -posix -W2 -DPOSIX rz.c
-
-bsd 4.4bsd 4.3reno 4.3tahoe 4.3bsd sun3.5 sun4.0 sun4.0.3c sun4.1:
-	$(CC) $(CFLAGS) -DMD=2 -Dstrchr=index -DV7 sz.c
-	$(CC) $(CFLAGS) -DV7 -DNFGVMIN rz.c
-
-tandy:
-	$(CC) $(CFLAGS) -n -DUSG -DMD -DT6K sz.c
-	$(CC) $(CFLAGS) -n -DUSG -DMD -DT6K rz.c
-
-dnix:
-	$(CC) $(CFLAGS) -DUSG -DMD sz.c
-	$(CC) $(CFLAGS) -DSV -DUSG -DNFGVMIN -DREADCHECK rz.c
-
-dnix5r3:
-	$(CC) $(CFLAGS) -DUSG -DMD=2 sz.c
-	$(CC) $(CFLAGS) -DUSG -DSV -DNFGVMIN -DREADCHECK rz.c
-
-amiga:
-	$(CC) $(CFLAGS) -DUSG -DNFGVMIN -g sz.c
-	$(CC) $(CFLAGS) -DUSG -DSV -DNFGVMIN -g rz.c
+rz.o : zmodem.h
+sz.o : zmodem.h