zumun/woff2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Makefile fixes and cleanups

Browse Source 
- Distinguish between CC/CFLAGS, CPP/CPPFLAGS and CXX/CXXFLAGS.
  Do not store compiler flags in CPPFLAGS, which is for preprocessor.
- Use COMMON_FLAGS for flags that are for both C and C++.
- Use $(MAKE) instead of make, so that parallel building works.
- Drop -m64 flag which is wrong on 32-bit systems.
This commit is contained in:
Dmitry Shachnev
2015-03-13 17:45:09 +03:00
parent 0c1ec8895b
commit 5b99d15ab3
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+14 -11
View File
@@ -1,18 +1,21 @@
OS := $(shell uname) OS := $(shell uname)
IDIRS=-I./brotli/dec/ -I./brotli/enc/ -I./src CPPFLAGS = -I./brotli/dec/ -I./brotli/enc/ -I./src
CXX = g++ CC ?= gcc
LFLAGS = CXX ?= g++
GFLAGS=-no-canonical-prefixes -fno-omit-frame-pointer -m64
CXXFLAGS = -c $(IDIRS) -std=c++0x $(GFLAGS) COMMON_FLAGS = -fno-omit-frame-pointer -no-canonical-prefixes
ifeq ($(OS), Darwin) ifeq ($(OS), Darwin)
CXXFLAGS += -DOS_MACOSX CPPFLAGS += -DOS_MACOSX
else else
CXXFLAGS += -fno-tree-vrp COMMON_FLAGS += -fno-tree-vrp
endif endif
CFLAGS += $(COMMON_FLAGS)
CXXFLAGS += $(COMMON_FLAGS) -std=c++11
SRCDIR = src 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 \
@@ -33,10 +36,10 @@ $(EXECUTABLES) : $(EXE_OBJS) deps
$(CXX) $(LFLAGS) $(OBJS) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/$@.o -o $@ $(CXX) $(LFLAGS) $(OBJS) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/$@.o -o $@
deps : deps :
make -C $(BROTLI)/dec $(MAKE) -C $(BROTLI)/dec
make -C $(BROTLI)/enc $(MAKE) -C $(BROTLI)/enc
clean : clean :
rm -f $(OBJS) $(EXE_OBJS) $(EXECUTABLES) rm -f $(OBJS) $(EXE_OBJS) $(EXECUTABLES)
make -C $(BROTLI)/dec clean $(MAKE) -C $(BROTLI)/dec clean
make -C $(BROTLI)/enc clean $(MAKE) -C $(BROTLI)/enc clean