Move the Makefile to the top directory

This commit is contained in:
Khaled Hosny
2014-11-22 16:32:26 +02:00
parent 09c4eba0f6
commit 3e1f5ca955
3 changed files with 8 additions and 7 deletions
+7 -5
View File
@@ -1,23 +1,25 @@
#Converter makefile #Converter makefile
include ../shared.mk include shared.mk
SRCDIR = src
OUROBJ = font.o glyph.o normalize.o table_tags.o transform.o \ OUROBJ = font.o glyph.o normalize.o table_tags.o transform.o \
woff2_dec.o woff2_enc.o woff2_dec.o woff2_enc.o
BROTLI = ../brotli BROTLI = brotli
ENCOBJ = $(BROTLI)/enc/*.o ENCOBJ = $(BROTLI)/enc/*.o
DECOBJ = $(BROTLI)/dec/*.o DECOBJ = $(BROTLI)/dec/*.o
OBJS = $(OUROBJ) OBJS = $(patsubst %, $(SRCDIR)/%, $(OUROBJ))
EXECUTABLES=woff2_compress woff2_decompress EXECUTABLES=woff2_compress woff2_decompress
EXE_OBJS=$(patsubst %, %.o, $(EXECUTABLES)) EXE_OBJS=$(patsubst %, $(SRCDIR)/%.o, $(EXECUTABLES))
all : $(OBJS) $(EXECUTABLES) all : $(OBJS) $(EXECUTABLES)
$(EXECUTABLES) : $(EXE_OBJS) deps $(EXECUTABLES) : $(EXE_OBJS) deps
$(CPP) $(LFLAGS) $(OBJS) $(ENCOBJ) $(DECOBJ) $@.o -o $@ $(CPP) $(LFLAGS) $(OBJS) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/$@.o -o $@
deps : deps :
make -C $(BROTLI)/dec make -C $(BROTLI)/dec
-1
View File
@@ -22,7 +22,6 @@ git clone https://github.com/google/woff2.git
cd woff2 cd woff2
git submodule init git submodule init
git submodule update git submodule update
cd woff2
make clean all make clean all
``` ```
+1 -1
View File
@@ -1,5 +1,5 @@
OS := $(shell uname) 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 GFLAGS=-no-canonical-prefixes -fno-omit-frame-pointer -m64