From 19b484c415934ae3faa4da8a0d4ad49a7336233c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 18 Jul 2022 17:02:37 +0100 Subject: [PATCH] minizip: use default variables/rules in Makefile The minizip bare Makefile overrides CC/CFLAGS and the default compile/link rules for no reason, which breaks users who want to pass specific CFLAGS/LDFLAGS. These can all be removed: the out-of-box build is unchaged but overriding CFLAGS or LDFLAGS now works as expected. Signed-off-by: Ross Burton --- contrib/minizip/Makefile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/contrib/minizip/Makefile b/contrib/minizip/Makefile index aac76e0..4a0465f 100644 --- a/contrib/minizip/Makefile +++ b/contrib/minizip/Makefile @@ -1,19 +1,13 @@ -CC=cc -CFLAGS := $(CFLAGS) -O -I../.. +CPPFLAGS = -I../.. UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a ZIP_OBJS = minizip.o zip.o ioapi.o ../../libz.a -.c.o: - $(CC) -c $(CFLAGS) $*.c - all: miniunz minizip miniunz: $(UNZ_OBJS) - $(CC) $(CFLAGS) -o $@ $(UNZ_OBJS) minizip: $(ZIP_OBJS) - $(CC) $(CFLAGS) -o $@ $(ZIP_OBJS) test: miniunz minizip @rm -f test.*