From: Eric Bavier Date: Sat, 2 Apr 2016 01:31:03 -0500 Subject: [PATCH] Build against external libbrotli. --- Makefile | 20 ++++---------------- src/woff2_dec.cc | 2 +- src/woff2_enc.cc | 2 +- 3 files changed, 6 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 92b8d54..618a751 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ OS := $(shell uname) -CPPFLAGS = -I./brotli/dec/ -I./brotli/enc/ -I./src +CPPFLAGS := -I./src $(shell pkg-config --cflags libbrotlienc libbrotlidec) CC ?= gcc CXX ?= g++ @@ -22,29 +22,17 @@ OUROBJ = font.o glyph.o normalize.o table_tags.o transform.o \ woff2_dec.o woff2_enc.o woff2_common.o woff2_out.o \ variable_length.o -BROTLI = brotli -ENCOBJ = $(BROTLI)/enc/*.o -DECOBJ = $(BROTLI)/dec/*.o +BROTLI_LIBS := $(shell pkg-config --libs libbrotlienc libbrotlidec) OBJS = $(patsubst %, $(SRCDIR)/%, $(OUROBJ)) EXECUTABLES=woff2_compress woff2_decompress EXE_OBJS=$(patsubst %, $(SRCDIR)/%.o, $(EXECUTABLES)) -ifeq (,$(wildcard $(BROTLI)/*)) - $(error Brotli dependency not
aboutsummaryrefslogtreecommitdiff