@import url("/assets/md.css")Merge pull request #10 from musicinmybrain/external-zopfli-support-bis v1.3.0

@import url("/assets/md.css")Reduce coupling with bundled Zopfli library

1 files changed, 29 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index cb2577a..4fd80b1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,38 @@
-FILES=blocksplitter.c cache.c deflate.c gzip_container.c hash.c katajainen.c lz77.c squeeze.c tree.c util.c zlib_container.c zopfli_lib.c woff.c
+# When using the bundled Zopfli library, this is a list of sources to compile.
+# To use an external Zopfli library, override it with the path to a static
+# library, or with something like -lzopfli.
+ZOPFLI_LIBS=zopfli/blocksplitter.c \
+	    zopfli/cache.c \
+	    zopfli/deflate.c \
+	    zopfli/gzip_container.c \
+	    zopfli/hash.c \
+	    zopfli/katajainen.c \
+	    zopfli/lz77.c \
+	    zopfli/squeeze.c \
+	    zopfli/tree.c \
+	    zopfli/util.c \
+	    zopfli/zlib_container.c \
+	    zopfli/zopfli_lib.c
+# When not using the bundled Zopfli library, this should normally be overridden
+# 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) $(LDFLAGS) $(FILES) $< -o $@ -lz -lm
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZOPFLI_CFLAGS) $(ZLIB_CFLAGS) \
+		$(FILES) $< -o $@ \
+		$(LDFLAGS) $(ZOPFLI_LIBS) $(ZLIB_LIBS) -lm
 
 woff2sfnt-zopfli: woff2sfnt.c $(FILES) Makefile
-	$(CC) $(LDFLAGS) $(FILES) $< -o $@ -lz -lm
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(ZOPFLI_CFLAGS) $(ZLIB_CFLAGS) \
+		$(FILES) $< -o $@ \
+		$(LDFLAGS) $(ZOPFLI_LIBS) $(ZLIB_LIBS) -lm
 
 clean:
 	$(RM) -r *.o *.dSYM sfnt2woff-zopfli woff2sfnt-zopfli *.gch *.out