diff options
| author | Mark Adler <madler@alumni.caltech.edu> | 2024-01-21 09:24:10 -0800 |
|---|---|---|
| committer | Mark Adler <madler@alumni.caltech.edu> | 2024-01-21 09:25:44 -0800 |
| commit | c06dfecb8a0c996dce87148b9086f0fe79734f32 (patch) | |
| tree | efa48c292fdf184cc5ca780c69e11c3efcf54a9f | |
| parent | 88ec24670e9c484219392def5f2f4b5e3f839db3 (diff) | |
| download | zlib-c06dfecb8a0c996dce87148b9086f0fe79734f32.tar.gz zlib-c06dfecb8a0c996dce87148b9086f0fe79734f32.tar.bz2 zlib-c06dfecb8a0c996dce87148b9086f0fe79734f32.zip | |
Use Makefile compiler for minizip-test target.
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | contrib/minizip/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index b584073..acda3b1 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -360,7 +360,7 @@ zconf: $(SRCDIR)zconf.h.in | |||
| 360 | cp -p $(SRCDIR)zconf.h.in zconf.h | 360 | cp -p $(SRCDIR)zconf.h.in zconf.h |
| 361 | 361 | ||
| 362 | minizip-test: static | 362 | minizip-test: static |
| 363 | cd contrib/minizip && { CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; } | 363 | cd contrib/minizip && { CC="$(CC)" CFLAGS="$(CFLAGS)" $(MAKE) test ; cd ../.. ; } |
| 364 | 364 | ||
| 365 | minizip-clean: | 365 | minizip-clean: |
| 366 | cd contrib/minizip && { $(MAKE) clean ; cd ../.. ; } | 366 | cd contrib/minizip && { $(MAKE) clean ; cd ../.. ; } |
diff --git a/contrib/minizip/Makefile b/contrib/minizip/Makefile index aac76e0..3d927ec 100644 --- a/contrib/minizip/Makefile +++ b/contrib/minizip/Makefile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | CC=cc | 1 | CC?=cc |
| 2 | CFLAGS := $(CFLAGS) -O -I../.. | 2 | CFLAGS := $(CFLAGS) -O -I../.. |
| 3 | 3 | ||
| 4 | UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a | 4 | UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a |