1 files changed, 35 insertions, 86 deletions

diff --git a/Makefile b/Makefile
index fe5b372..45c96e4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,129 +2,78 @@
 # Copyright (C) 1995-1996 Jean-loup Gailly.
 # For conditions of distribution and use, see copyright notice in zlib.h 
 
-# To compile and test, type:
-#   ./configure; make test
-# The call of configure is optional if you don't have special requirements
-
-# To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type:
-#    make install
-# To install in $HOME instead of /usr/local, use:
-#    make install prefix=$HOME
-
 CC=cc
-
 CFLAGS=-O
-#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
+#use -O3 for gcc
+#CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7"
 #CFLAGS=-g -DDEBUG
-#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
-#           -Wstrict-prototypes -Wmissing-prototypes
-
 LDFLAGS=-L. -lz
-LDSHARED=$(CC)
 
-VER=1.0
-LIBS=libz.a
-
-AR=ar rc
 RANLIB=ranlib
-TAR=tar
 
 prefix=/usr/local
-exec_prefix = $(prefix)
+exec_prefix = ${prefix}
 
 OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \
        zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o
 
 TEST_OBJS = example.o minigzip.o
 
-DISTFILES = README ChangeLog configure Makefile.in Makefile Makefile.msc \
-            Makefile.bor Makefile.tc Make_vms.com descrip.mms *.[ch]
-
 all: example minigzip
 
 test: all
         ./example
         echo hello world | ./minigzip | ./minigzip -d 
 
-libz.a: $(OBJS)
-        $(AR) $@ $(OBJS)
-        -@ ($(RANLIB) $@ || true) 2>/dev/null
+install: libz.a
+        -@mkdir $(prefix)/include
+        -@mkdir $(exec_prefix)/lib
+        cp zlib.h zconf.h $(prefix)/include
+        chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
+        cp libz.a $(exec_prefix)/lib
+        chmod 644 $(exec_prefix)/lib/libz.a
+        -@$(RANLIB) $(prefix)/lib/libz.a
+# This second ranlib is needed on NeXTSTEP which checks file times
 
-libz.so.$(VER): $(OBJS)
-        $(LDSHARED) -o $@ $(OBJS)
-        rm -f libz.so; ln -s $@ libz.so
+libz.a: $(OBJS)
+        ar rc $@ $(OBJS)
+        -@$(RANLIB) $@
 
-example: example.o $(LIBS)
+example: example.o libz.a
         $(CC) $(CFLAGS) -o $@ example.o $(LDFLAGS)
 
-minigzip: minigzip.o $(LIBS)
+minigzip: minigzip.o libz.a
         $(CC) $(CFLAGS) -o $@ minigzip.o $(LDFLAGS)
 
-install: $(LIBS)
-        -@if [ ! $(prefix)/include  ]; then mkdir $(prefix)/include; fi
-        -@if [ ! $(exec_prefix)/lib ]; then mkdir $(exec_prefix)/lib; fi
-        cp zlib.h zconf.h $(prefix)/include
-        chmod 644 $(prefix)/include/zlib.h $(prefix)/include/zconf.h
-        cp $(LIBS) $(exec_prefix)/lib
-        cd $(exec_prefix)/lib; chmod 644 $(LIBS)
-        -@(cd $(exec_prefix)/lib; $(RANLIB) libz.a || true) >/dev/null 2>&1
-        cd $(exec_prefix)/lib; if test -f libz.so.$(VER); then \
-          ln -s libz.so.$(VER) libz.so; \
-        fi
-# The ranlib in install is needed on NeXTSTEP which checks file times
-
-uninstall:
-        cd $(exec_prefix)/lib; rm -f $(LIBS); \
-        if test -f libz.so; then \
-         v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p'<$(prefix)/include/zlib.h`;\
-         rm -f libz.so.$$v libz.so; \
-        fi
-        cd $(prefix)/include; rm -f zlib.h zconf.h
-
 clean:
-        rm -f *.o *~ example minigzip libz.a libz.so* foo.gz
+        rm -f *.o example minigzip libz.a foo.gz
 
 zip:
-        mv Makefile Makefile~; cp -p Makefile.in Makefile
-        v=`sed -n -e 's/\./-/' -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
-        zip -ul9 zlib-$$v $(DISTFILES)
-        mv Makefile~ Makefile
-
-dist:
-        mv Makefile Makefile~; cp -p Makefile.in Makefile
-        d=zlib-`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`;\
-        rm -f $$d.tar.gz; \
-        if test ! -d ../$$d; then rm -f ../$$d; ln -s `pwd` ../$$d; fi; \
-        files=""; \
-        for f in $(DISTFILES); do files="$$files $$d/$$f"; done; \
-        cd ..; \
-        GZIP=-9 $(TAR) chofz $$d/$$d.tar.gz $$files; \
-        if test ! -d $$d; then rm -f $$d; fi
-        mv Makefile~ Makefile
-
-tags:   
-        etags *.[ch]
+        zip -ul9 zlib README ChangeLog Makefile Make????.??? Makefile.?? \
+          descrip.mms *.[ch]
 
-depend:
-        makedepend -- $(CFLAGS) -- *.[ch]
+tgz:
+        cd ..; tar cfz zlib/zlib.tgz zlib/README zlib/ChangeLog zlib/Makefile \
+          zlib/Make????.??? zlib/Makefile.?? zlib/descrip.mms zlib/*.[ch]
+
+TAGS:
+        etags *.[ch]
 
 # DO NOT DELETE THIS LINE -- make depend depends on it.
 
-adler32.o: zlib.h zconf.h
+adler32.o: zutil.h zlib.h zconf.h
 compress.o: zlib.h zconf.h
-crc32.o: zlib.h zconf.h
+crc32.o: zutil.h zlib.h zconf.h
 deflate.o: deflate.h zutil.h zlib.h zconf.h
 example.o: zlib.h zconf.h
 gzio.o: zutil.h zlib.h zconf.h
-infblock.o: infblock.h inftrees.h infcodes.h infutil.h zutil.h zlib.h zconf.h
-infcodes.o: zutil.h zlib.h zconf.h
-infcodes.o: inftrees.h infblock.h infcodes.h infutil.h inffast.h
-inffast.o: zutil.h zlib.h zconf.h inftrees.h
-inffast.o: infblock.h infcodes.h infutil.h inffast.h
+infblock.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
+infcodes.o: zutil.h zlib.h zconf.h inftrees.h infutil.h infcodes.h inffast.h
+inffast.o: zutil.h zlib.h zconf.h inftrees.h infutil.h inffast.h
 inflate.o: zutil.h zlib.h zconf.h infblock.h
 inftrees.o: zutil.h zlib.h zconf.h inftrees.h
-infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h
-minigzip.o:  zlib.h zconf.h 
-trees.o: deflate.h zutil.h zlib.h zconf.h 
+infutil.o: zutil.h zlib.h zconf.h inftrees.h infutil.h
+minigzip.o: zlib.h zconf.h
+trees.o: deflate.h zutil.h zlib.h zconf.h
 uncompr.o: zlib.h zconf.h
-zutil.o: zutil.h zlib.h zconf.h  
+zutil.o: zutil.h zlib.h zconf.h