diff --git a/src/Makefile b/Makefile similarity index 67% rename from src/Makefile rename to Makefile index 3782048..d343078 100644 --- a/src/Makefile +++ b/Makefile @@ -1,23 +1,25 @@ #Converter makefile -include ../shared.mk +include shared.mk + +SRCDIR = src OUROBJ = font.o glyph.o normalize.o table_tags.o transform.o \ woff2_dec.o woff2_enc.o -BROTLI = ../brotli +BROTLI = brotli ENCOBJ = $(BROTLI)/enc/*.o DECOBJ = $(BROTLI)/dec/*.o -OBJS = $(OUROBJ) +OBJS = $(patsubst %, $(SRCDIR)/%, $(OUROBJ)) EXECUTABLES=woff2_compress woff2_decompress -EXE_OBJS=$(patsubst %, %.o, $(EXECUTABLES)) +EXE_OBJS=$(patsubst %, $(SRCDIR)/%.o, $(EXECUTABLES)) all : $(OBJS) $(EXECUTABLES) $(EXECUTABLES) : $(EXE_OBJS) deps - $(CPP) $(LFLAGS) $(OBJS) $(ENCOBJ) $(DECOBJ) $@.o -o $@ + $(CPP) $(LFLAGS) $(OBJS) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/$@.o -o $@ deps : make -C $(BROTLI)/dec diff --git a/README.md b/README.md index 8de39b0..ea55a36 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,6 @@ git clone https://github.com/google/woff2.git cd woff2 git submodule init git submodule update -cd woff2 make clean all ``` diff --git a/shared.mk b/shared.mk index 15dca18..45ee7c4 100644 --- a/shared.mk +++ b/shared.mk @@ -1,5 +1,5 @@ OS := $(shell uname) -IDIRS=-I../brotli/dec/ -I../brotli/enc/ -I../ +IDIRS=-I./brotli/dec/ -I./brotli/enc/ -I./src GFLAGS=-no-canonical-prefixes -fno-omit-frame-pointer -m64