summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2012-03-10 09:58:37 -0800
committerMark Adler <madler@alumni.caltech.edu>2012-03-10 09:58:37 -0800
commite076ca8e6254b7f52fca7b8cf3f3e3eb86dd9132 (patch)
tree3d69e596915ebcbdb75bdbf014729127da0a6614 /win32
parente2abd78a98335df958e8dbb1d513261a8cb89739 (diff)
downloadzlib-e076ca8e6254b7f52fca7b8cf3f3e3eb86dd9132.tar.gz
Fix comments in win32/Makefile.gcc for proper usage.
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.gcc15
1 files changed, 7 insertions, 8 deletions
diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc
index 55f3c1e..203d769 100644
--- a/win32/Makefile.gcc
+++ b/win32/Makefile.gcc
@@ -1,23 +1,25 @@
# Makefile for zlib, derived from Makefile.dj2.
# Modified for mingw32 by C. Spieler, 6/16/98.
# Updated for zlib 1.2.x by Christian Spieler and Cosmin Truta, Mar-2003.
-# Last updated: 1-Aug-2003.
+# Last updated: Mar 2012.
# Tested under Cygwin and MinGW.
# Copyright (C) 1995-2003 Jean-loup Gailly.
# For conditions of distribution and use, see copyright notice in zlib.h
-# To compile, or to compile and test, type:
+# To compile, or to compile and test, type from the top level zlib directory:
#
-# make -fmakefile.gcc; make test testdll -fmakefile.gcc
+# make -fwin32/Makefile.gcc; make test testdll -fwin32/Makefile.gcc
#
# To use the asm code, type:
# cp contrib/asm?86/match.S ./match.S
-# make LOC=-DASMV OBJA=match.o -fmakefile.gcc
+# make LOC=-DASMV OBJA=match.o -fwin32/Makefile.gcc
#
# To install libz.a, zconf.h and zlib.h in the system directories, type:
#
-# make install -fmakefile.gcc
+# make install -fwin32/Makefile.gcc
+#
+# BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set.
# Note:
# If the platform is *not* MinGW (e.g. it is Cygwin or UWIN),
@@ -117,9 +119,6 @@ minigzip.o: test/minigzip.c zlib.h zconf.h
zlibrc.o: win32/zlib1.rc
$(RC) $(RCFLAGS) -o $@ win32/zlib1.rc
-
-# BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set.
-
.PHONY: install uninstall clean
install: zlib.h zconf.h $(STATICLIB) $(IMPLIB)