zlib 1.2.0.5v1.2.0.5

1 files changed, 13 insertions, 31 deletions

diff --git a/old/nt/Makefile.gcc b/win32/Makefile.emx
index cdd652f..7b08424 100644
--- a/old/nt/Makefile.gcc
+++ b/win32/Makefile.emx
@@ -1,18 +1,13 @@
-# Makefile for zlib.  Modified for mingw32 by C. Spieler, 6/16/98.
-# (This Makefile is directly derived from Makefile.dj2)
+# Makefile for zlib.  Modified for emx/rsxnt by Chr. Spieler, 6/16/98.
 # Copyright (C) 1995-1998 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h 
+# For conditions of distribution and use, see copyright notice in zlib.h
 
 # To compile, or to compile and test, type:
-# 
-#   make -fmakefile.gcc;  make test -fmakefile.gcc
-# 
-# To install libz.a, zconf.h and zlib.h in the mingw32 directories, type:
-# 
-#    make install -fmakefile.gcc
-# 
+#
+#   make -fmakefile.emx;  make test -fmakefile.emx
+#
 
-CC=gcc
+CC=gcc -Zwin32
 
 #CFLAGS=-MMD -O
 #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
@@ -26,12 +21,12 @@ CP=copy /Y
 INSTALL=$(CP)
 # The default value of RM is "rm -f."  If "rm.exe" is found, comment out:
 RM=del
-LDLIBS=-L. -lz
+LDLIBS=-L. -lzlib
 LD=$(CC) -s -o
 LDSHARED=$(CC)
 
 INCL=zlib.h zconf.h
-LIBS=libz.a
+LIBS=zlib.a
 
 AR=ar rcs
 
@@ -39,7 +34,7 @@ prefix=/usr/local
 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
+       zutil.o inflate.o infback.o inftrees.o inffast.o
 
 TEST_OBJS = example.o minigzip.o
 
@@ -47,38 +42,25 @@ all: example.exe minigzip.exe
 
 test: all
         ./example
-        echo hello world | .\minigzip | .\minigzip -d 
+        echo hello world | .\minigzip | .\minigzip -d
 
 %.o : %.c
         $(CC) $(CFLAGS) -c $< -o $@
 
-libz.a: $(OBJS)
+zlib.a: $(OBJS)
         $(AR) $@ $(OBJS)
 
 %.exe : %.o $(LIBS)
         $(LD) $@ $< $(LDLIBS)
 
-# INCLUDE_PATH and LIBRARY_PATH were set for [make] in djgpp.env .
 
-.PHONY : uninstall clean
-
-install: $(INCL) $(LIBS)
-        -@if not exist $(INCLUDE_PATH)\nul mkdir $(INCLUDE_PATH)
-        -@if not exist $(LIBRARY_PATH)\nul mkdir $(LIBRARY_PATH)
-        $(INSTALL) zlib.h $(INCLUDE_PATH)
-        $(INSTALL) zconf.h $(INCLUDE_PATH)
-        $(INSTALL) libz.a $(LIBRARY_PATH)
-
-uninstall:
-        $(RM) $(INCLUDE_PATH)\zlib.h
-        $(RM) $(INCLUDE_PATH)\zconf.h
-        $(RM) $(LIBRARY_PATH)\libz.a
+.PHONY : clean
 
 clean:
         $(RM) *.d
         $(RM) *.o
         $(RM) *.exe
-        $(RM) libz.a
+        $(RM) zlib.a
         $(RM) foo.gz
 
 DEPS := $(wildcard *.d)