aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatarLarge Libravatar Benjamin Beasley <codemusicinmybrainnet>2020-10-20 18:05:40 -0400
committerLibravatarLarge Libravatar Benjamin Beasley <codemusicinmybrainnet>2020-10-20 18:15:37 -0400
commit6b63776f3d03f8b88d23cedb6fe2a9bd2947d93d (patch)
tree81efe5d4d3e548eeef96b47cafd1fa73263ef458
parent6323a64c051817854a7c992e0259cc0e2bc5fb38 (diff)
downloadsfnt2woff-zopfli-6b63776f3d03f8b88d23cedb6fe2a9bd2947d93d.tar.gz
sfnt2woff-zopfli-6b63776f3d03f8b88d23cedb6fe2a9bd2947d93d.tar.bz2
sfnt2woff-zopfli-6b63776f3d03f8b88d23cedb6fe2a9bd2947d93d.tar.lz
sfnt2woff-zopfli-6b63776f3d03f8b88d23cedb6fe2a9bd2947d93d.zip

Add ZLIB_LIBS and ZLIB_CFLAGS variables to the Makefile to make it easy to

control linking against zlib, just as we added ZOPFLI_LIBS and ZOPFLI_CFLAGS for the Zopfli library.

-rw-r--r--Makefile11
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index c377015..4fd80b1 100644
--- a/Makefile
+++ b/Makefile
@@ -17,19 +17,22 @@ ZOPFLI_LIBS=zopfli/blocksplitter.c \
# with the empty string to avoid finding bundled Zopfli headers.
ZOPFLI_CFLAGS=-Izopfli
+ZLIB_LIBS=-lz
+ZLIB_CFLAGS=
+
FILES=woff.c
all: sfnt2woff-zopfli woff2sfnt-zopfli
sfnt2woff-zopfli: sfnt2woff.c $(FILES) Makefile
- $(CC) $(CPPFLAGS) $(CFLAGS) $(ZOPFLI_CFLAGS) \
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(ZOPFLI_CFLAGS) $(ZLIB_CFLAGS) \
$(FILES) $< -o $@ \
- $(LDFLAGS) $(ZOPFLI_LIBS) -lz -lm
+ $(LDFLAGS) $(ZOPFLI_LIBS) $(ZLIB_LIBS) -lm
woff2sfnt-zopfli: woff2sfnt.c $(FILES) Makefile
- $(CC) $(CPPFLAGS) $(CFLAGS) $(ZOPFLI_CFLAGS) \
+ $(CC) $(CPPFLAGS) $(CFLAGS) $(ZOPFLI_CFLAGS) $(ZLIB_CFLAGS) \
$(FILES) $< -o $@ \
- $(LDFLAGS) $(ZOPFLI_LIBS) -lz -lm
+ $(LDFLAGS) $(ZOPFLI_LIBS) $(ZLIB_LIBS) -lm
clean:
$(RM) -r *.o *.dSYM sfnt2woff-zopfli woff2sfnt-zopfli *.gch *.out