diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2012-03-10 09:58:37 -0800 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2012-03-10 09:58:37 -0800 |
| commit | e076ca8e6254b7f52fca7b8cf3f3e3eb86dd9132 (patch) | |
| tree | 3d69e596915ebcbdb75bdbf014729127da0a6614 | |
| parent | e2abd78a98335df958e8dbb1d513261a8cb89739 (diff) | |
| download | zlib-e076ca8e6254b7f52fca7b8cf3f3e3eb86dd9132.tar.gz zlib-e076ca8e6254b7f52fca7b8cf3f3e3eb86dd9132.tar.bz2 zlib-e076ca8e6254b7f52fca7b8cf3f3e3eb86dd9132.zip | |
Fix comments in win32/Makefile.gcc for proper usage.
| -rw-r--r-- | win32/Makefile.gcc | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc index 55f3c1ed..203d769a 100644 --- a/win32/Makefile.gcc +++ b/win32/Makefile.gcc | |||
| @@ -1,23 +1,25 @@ | |||
| 1 | # Makefile for zlib, derived from Makefile.dj2. | 1 | # Makefile for zlib, derived from Makefile.dj2. |
| 2 | # Modified for mingw32 by C. Spieler, 6/16/98. | 2 | # Modified for mingw32 by C. Spieler, 6/16/98. |
| 3 | # Updated for zlib 1.2.x by Christian Spieler and Cosmin Truta, Mar-2003. | 3 | # Updated for zlib 1.2.x by Christian Spieler and Cosmin Truta, Mar-2003. |
| 4 | # Last updated: 1-Aug-2003. | 4 | # Last updated: Mar 2012. |
| 5 | # Tested under Cygwin and MinGW. | 5 | # Tested under Cygwin and MinGW. |
| 6 | 6 | ||
| 7 | # Copyright (C) 1995-2003 Jean-loup Gailly. | 7 | # Copyright (C) 1995-2003 Jean-loup Gailly. |
| 8 | # For conditions of distribution and use, see copyright notice in zlib.h | 8 | # For conditions of distribution and use, see copyright notice in zlib.h |
| 9 | 9 | ||
| 10 | # To compile, or to compile and test, type: | 10 | # To compile, or to compile and test, type from the top level zlib directory: |
| 11 | # | 11 | # |
| 12 | # make -fmakefile.gcc; make test testdll -fmakefile.gcc | 12 | # make -fwin32/Makefile.gcc; make test testdll -fwin32/Makefile.gcc |
| 13 | # | 13 | # |
| 14 | # To use the asm code, type: | 14 | # To use the asm code, type: |
| 15 | # cp contrib/asm?86/match.S ./match.S | 15 | # cp contrib/asm?86/match.S ./match.S |
| 16 | # make LOC=-DASMV OBJA=match.o -fmakefile.gcc | 16 | # make LOC=-DASMV OBJA=match.o -fwin32/Makefile.gcc |
| 17 | # | 17 | # |
| 18 | # To install libz.a, zconf.h and zlib.h in the system directories, type: | 18 | # To install libz.a, zconf.h and zlib.h in the system directories, type: |
| 19 | # | 19 | # |
| 20 | # make install -fmakefile.gcc | 20 | # make install -fwin32/Makefile.gcc |
| 21 | # | ||
| 22 | # BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set. | ||
| 21 | 23 | ||
| 22 | # Note: | 24 | # Note: |
| 23 | # If the platform is *not* MinGW (e.g. it is Cygwin or UWIN), | 25 | # 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 | |||
| 117 | zlibrc.o: win32/zlib1.rc | 119 | zlibrc.o: win32/zlib1.rc |
| 118 | $(RC) $(RCFLAGS) -o $@ win32/zlib1.rc | 120 | $(RC) $(RCFLAGS) -o $@ win32/zlib1.rc |
| 119 | 121 | ||
| 120 | |||
| 121 | # BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set. | ||
| 122 | |||
| 123 | .PHONY: install uninstall clean | 122 | .PHONY: install uninstall clean |
| 124 | 123 | ||
| 125 | install: zlib.h zconf.h $(STATICLIB) $(IMPLIB) | 124 | install: zlib.h zconf.h $(STATICLIB) $(IMPLIB) |
