diff options
| author | Ross Burton <ross.burton@arm.com> | 2022-07-18 17:02:37 +0100 |
|---|---|---|
| committer | Mark Adler <git@madler.net> | 2026-02-13 15:12:34 -0800 |
| commit | 9ac9b6bb2d1858e1d95561642f672798deb5c5f4 (patch) | |
| tree | 247767705f88197aa1c4f1992ad6b03e6778976e | |
| parent | 3c173d5851675b8f9ef8a4eb4f90886d6adb2cb2 (diff) | |
| download | zlib-9ac9b6bb2d1858e1d95561642f672798deb5c5f4.tar.gz zlib-9ac9b6bb2d1858e1d95561642f672798deb5c5f4.tar.bz2 zlib-9ac9b6bb2d1858e1d95561642f672798deb5c5f4.zip | |
Fix the minizip Makefile to use the default variables and rules.
| -rw-r--r-- | contrib/minizip/Makefile | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/contrib/minizip/Makefile b/contrib/minizip/Makefile index b3e050a0..f5f65f72 100644 --- a/contrib/minizip/Makefile +++ b/contrib/minizip/Makefile | |||
| @@ -1,12 +1,8 @@ | |||
| 1 | CC?=cc | 1 | CPPFLAGS = -I../.. |
| 2 | CFLAGS := -O $(CFLAGS) -I../.. | ||
| 3 | 2 | ||
| 4 | UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a | 3 | UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a |
| 5 | ZIP_OBJS = minizip.o zip.o ioapi.o ../../libz.a | 4 | ZIP_OBJS = minizip.o zip.o ioapi.o ../../libz.a |
| 6 | 5 | ||
| 7 | .c.o: | ||
| 8 | $(CC) -c $(CFLAGS) $*.c | ||
| 9 | |||
| 10 | all: miniunz minizip | 6 | all: miniunz minizip |
| 11 | 7 | ||
| 12 | miniunz.o: miniunz.c unzip.h iowin32.h | 8 | miniunz.o: miniunz.c unzip.h iowin32.h |
| @@ -18,10 +14,8 @@ iowin32.o: iowin32.c iowin32.h ioapi.h | |||
| 18 | mztools.o: mztools.c unzip.h | 14 | mztools.o: mztools.c unzip.h |
| 19 | 15 | ||
| 20 | miniunz: $(UNZ_OBJS) | 16 | miniunz: $(UNZ_OBJS) |
| 21 | $(CC) $(CFLAGS) -o $@ $(UNZ_OBJS) | ||
| 22 | 17 | ||
| 23 | minizip: $(ZIP_OBJS) | 18 | minizip: $(ZIP_OBJS) |
| 24 | $(CC) $(CFLAGS) -o $@ $(ZIP_OBJS) | ||
| 25 | 19 | ||
| 26 | test: miniunz minizip | 20 | test: miniunz minizip |
| 27 | @rm -f test.* | 21 | @rm -f test.* |