Fix Savannah bug #43976.
Assure that FreeType's internal include directories are found before `CPPFLAGS' (which might be set by the user in the environment), and `CPPFLAGS' before `CFLAGS'. * builds/freetype.mk (FT_CFLAGS): Don't add `INCLUDE_FLAGS'. (FT_COMPILE): Make this a special variable for compiling only the files handled in `freetype.mk'. (.c.$O): Removed, unused. * src/*/rules.mk (*_COMPILE): Fix order of include directories.
This commit is contained in:
parent
2af74c9b87
commit
36d03c9f58
15
ChangeLog
15
ChangeLog
|
@ -1,3 +1,18 @@
|
||||||
|
2015-01-12 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
Fix Savannah bug #43976.
|
||||||
|
|
||||||
|
Assure that FreeType's internal include directories are found before
|
||||||
|
`CPPFLAGS' (which might be set by the user in the environment), and
|
||||||
|
`CPPFLAGS' before `CFLAGS'.
|
||||||
|
|
||||||
|
* builds/freetype.mk (FT_CFLAGS): Don't add `INCLUDE_FLAGS'.
|
||||||
|
(FT_COMPILE): Make this a special variable for compiling only the
|
||||||
|
files handled in `freetype.mk'.
|
||||||
|
(.c.$O): Removed, unused.
|
||||||
|
|
||||||
|
* src/*/rules.mk (*_COMPILE): Fix order of include directories.
|
||||||
|
|
||||||
2015-01-11 Werner Lemberg <wl@gnu.org>
|
2015-01-11 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
[truetype] Prettyfing.
|
[truetype] Prettyfing.
|
||||||
|
|
|
@ -155,15 +155,13 @@ ifneq ($(wildcard $(OBJ_DIR)/ftoption.h),)
|
||||||
FTOPTION_FLAG := $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
|
FTOPTION_FLAG := $DFT_CONFIG_OPTIONS_H="<ftoption.h>"
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Note that a build with the `configure' script uses $(CFLAGS) only.
|
# `CPPFLAGS' might be specified by the user in the environment.
|
||||||
#
|
#
|
||||||
FT_CFLAGS = $(CPPFLAGS) \
|
FT_CFLAGS = $(CPPFLAGS) \
|
||||||
$(INCLUDE_FLAGS) \
|
|
||||||
$(CFLAGS) \
|
$(CFLAGS) \
|
||||||
$DFT2_BUILD_LIBRARY \
|
$DFT2_BUILD_LIBRARY \
|
||||||
$DFT_CONFIG_MODULES_H="<ftmodule.h>" \
|
$DFT_CONFIG_MODULES_H="<ftmodule.h>" \
|
||||||
$(FTOPTION_FLAG)
|
$(FTOPTION_FLAG)
|
||||||
FT_COMPILE = $(CC) $(ANSIFLAGS) $(FT_CFLAGS)
|
|
||||||
|
|
||||||
|
|
||||||
# Include the `exports' rules file.
|
# Include the `exports' rules file.
|
||||||
|
@ -195,6 +193,8 @@ DEVEL_H := $(wildcard $(TOP_DIR)/devel/*.h)
|
||||||
FREETYPE_H := $(PUBLIC_H) $(INTERNAL_H) $(CONFIG_H) $(DEVEL_H)
|
FREETYPE_H := $(PUBLIC_H) $(INTERNAL_H) $(CONFIG_H) $(DEVEL_H)
|
||||||
|
|
||||||
|
|
||||||
|
FT_COMPILE := $(CC) $(ANSIFLAGS) $(INCLUDE_FLAGS) $(FT_CFLAGS)
|
||||||
|
|
||||||
# ftsystem component
|
# ftsystem component
|
||||||
#
|
#
|
||||||
FTSYS_SRC ?= $(BASE_DIR)/ftsystem.c
|
FTSYS_SRC ?= $(BASE_DIR)/ftsystem.c
|
||||||
|
@ -270,9 +270,6 @@ objects: $(OBJECTS_LIST)
|
||||||
|
|
||||||
library: $(PROJECT_LIBRARY)
|
library: $(PROJECT_LIBRARY)
|
||||||
|
|
||||||
.c.$O:
|
|
||||||
$(FT_COMPILE) $T$(subst /,$(COMPILER_SEP),$@ $<)
|
|
||||||
|
|
||||||
|
|
||||||
ifneq ($(findstring refdoc,$(MAKECMDGOALS)),)
|
ifneq ($(findstring refdoc,$(MAKECMDGOALS)),)
|
||||||
# poor man's `sed' emulation with make's built-in string functions
|
# poor man's `sed' emulation with make's built-in string functions
|
||||||
|
|
|
@ -20,7 +20,10 @@ AUTOF_DIR := $(SRC_DIR)/autofit
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
AUTOF_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(AUTOF_DIR))
|
AUTOF_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(AUTOF_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# AUTOF driver sources (i.e., C files)
|
# AUTOF driver sources (i.e., C files)
|
||||||
|
|
|
@ -23,7 +23,10 @@
|
||||||
# layer proper.
|
# layer proper.
|
||||||
|
|
||||||
|
|
||||||
BASE_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(SRC_DIR)/base)
|
BASE_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(BASE_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# Base layer sources
|
# Base layer sources
|
||||||
|
|
|
@ -32,7 +32,10 @@
|
||||||
BDF_DIR := $(SRC_DIR)/bdf
|
BDF_DIR := $(SRC_DIR)/bdf
|
||||||
|
|
||||||
|
|
||||||
BDF_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(BDF_DIR))
|
BDF_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(BDF_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# bdf driver sources (i.e., C files)
|
# bdf driver sources (i.e., C files)
|
||||||
|
|
|
@ -22,7 +22,9 @@ BZIP2_DIR := $(SRC_DIR)/bzip2
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
BZIP2_COMPILE := $(FT_COMPILE)
|
BZIP2_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# BZIP2 support sources (i.e., C files)
|
# BZIP2 support sources (i.e., C files)
|
||||||
|
|
|
@ -17,9 +17,13 @@
|
||||||
#
|
#
|
||||||
CACHE_DIR := $(SRC_DIR)/cache
|
CACHE_DIR := $(SRC_DIR)/cache
|
||||||
|
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
CACHE_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(CACHE_DIR))
|
CACHE_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(CACHE_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# Cache driver sources (i.e., C files)
|
# Cache driver sources (i.e., C files)
|
||||||
|
@ -33,6 +37,7 @@ CACHE_DRV_SRC := $(CACHE_DIR)/ftcbasic.c \
|
||||||
$(CACHE_DIR)/ftcmru.c \
|
$(CACHE_DIR)/ftcmru.c \
|
||||||
$(CACHE_DIR)/ftcsbits.c
|
$(CACHE_DIR)/ftcsbits.c
|
||||||
|
|
||||||
|
|
||||||
# Cache driver headers
|
# Cache driver headers
|
||||||
#
|
#
|
||||||
CACHE_DRV_H := $(CACHE_DIR)/ftccache.h \
|
CACHE_DRV_H := $(CACHE_DIR)/ftccache.h \
|
||||||
|
|
|
@ -18,7 +18,10 @@
|
||||||
CFF_DIR := $(SRC_DIR)/cff
|
CFF_DIR := $(SRC_DIR)/cff
|
||||||
|
|
||||||
|
|
||||||
CFF_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(CFF_DIR))
|
CFF_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(CFF_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# CFF driver sources (i.e., C files)
|
# CFF driver sources (i.e., C files)
|
||||||
|
|
|
@ -18,7 +18,10 @@
|
||||||
CID_DIR := $(SRC_DIR)/cid
|
CID_DIR := $(SRC_DIR)/cid
|
||||||
|
|
||||||
|
|
||||||
CID_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(CID_DIR))
|
CID_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(CID_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# CID driver sources (i.e., C files)
|
# CID driver sources (i.e., C files)
|
||||||
|
|
|
@ -20,7 +20,10 @@ GXV_DIR := $(SRC_DIR)/gxvalid
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
GXV_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(GXV_DIR))
|
GXV_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(GXV_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# GXV driver sources (i.e., C files)
|
# GXV driver sources (i.e., C files)
|
||||||
|
|
|
@ -21,9 +21,14 @@ GZIP_DIR := $(SRC_DIR)/gzip
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
ifeq ($(SYSTEM_ZLIB),)
|
ifeq ($(SYSTEM_ZLIB),)
|
||||||
GZIP_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(GZIP_DIR))
|
GZIP_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(GZIP_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
else
|
else
|
||||||
GZIP_COMPILE := $(FT_COMPILE)
|
GZIP_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -23,7 +23,10 @@ LZW_DIR := $(SRC_DIR)/lzw
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
LZW_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(LZW_DIR))
|
LZW_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(LZW_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# LZW support sources (i.e., C files)
|
# LZW support sources (i.e., C files)
|
||||||
|
|
|
@ -20,7 +20,10 @@ OTV_DIR := $(SRC_DIR)/otvalid
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
OTV_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(OTV_DIR))
|
OTV_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(OTV_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# OTV driver sources (i.e., C files)
|
# OTV driver sources (i.e., C files)
|
||||||
|
|
|
@ -30,7 +30,10 @@
|
||||||
PCF_DIR := $(SRC_DIR)/pcf
|
PCF_DIR := $(SRC_DIR)/pcf
|
||||||
|
|
||||||
|
|
||||||
PCF_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(PCF_DIR))
|
PCF_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(PCF_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# pcf driver sources (i.e., C files)
|
# pcf driver sources (i.e., C files)
|
||||||
|
|
|
@ -20,7 +20,10 @@ PFR_DIR := $(SRC_DIR)/pfr
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
PFR_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(PFR_DIR))
|
PFR_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(PFR_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# pfr driver sources (i.e., C files)
|
# pfr driver sources (i.e., C files)
|
||||||
|
|
|
@ -20,7 +20,10 @@ PSAUX_DIR := $(SRC_DIR)/psaux
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
PSAUX_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(PSAUX_DIR))
|
PSAUX_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(PSAUX_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# PSAUX driver sources (i.e., C files)
|
# PSAUX driver sources (i.e., C files)
|
||||||
|
|
|
@ -20,7 +20,10 @@ PSHINTER_DIR := $(SRC_DIR)/pshinter
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
PSHINTER_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(PSHINTER_DIR))
|
PSHINTER_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(PSHINTER_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# PSHINTER driver sources (i.e., C files)
|
# PSHINTER driver sources (i.e., C files)
|
||||||
|
|
|
@ -20,7 +20,10 @@ PSNAMES_DIR := $(SRC_DIR)/psnames
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
PSNAMES_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(PSNAMES_DIR))
|
PSNAMES_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(PSNAMES_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# PSNames driver sources (i.e., C files)
|
# PSNames driver sources (i.e., C files)
|
||||||
|
|
|
@ -19,7 +19,10 @@ RASTER_DIR := $(SRC_DIR)/raster
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
RASTER_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(RASTER_DIR))
|
RASTER_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(RASTER_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# raster driver sources (i.e., C files)
|
# raster driver sources (i.e., C files)
|
||||||
|
|
|
@ -20,7 +20,10 @@ SFNT_DIR := $(SRC_DIR)/sfnt
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
SFNT_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(SFNT_DIR))
|
SFNT_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(SFNT_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# SFNT driver sources (i.e., C files)
|
# SFNT driver sources (i.e., C files)
|
||||||
|
|
|
@ -17,9 +17,13 @@
|
||||||
#
|
#
|
||||||
SMOOTH_DIR := $(SRC_DIR)/smooth
|
SMOOTH_DIR := $(SRC_DIR)/smooth
|
||||||
|
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
SMOOTH_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(SMOOTH_DIR))
|
SMOOTH_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(SMOOTH_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# smooth driver sources (i.e., C files)
|
# smooth driver sources (i.e., C files)
|
||||||
|
|
|
@ -20,7 +20,10 @@ TT_DIR := $(SRC_DIR)/truetype
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
TT_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(TT_DIR))
|
TT_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(TT_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# TrueType driver sources (i.e., C files)
|
# TrueType driver sources (i.e., C files)
|
||||||
|
|
|
@ -20,7 +20,10 @@ T1_DIR := $(SRC_DIR)/type1
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
T1_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(T1_DIR))
|
T1_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(T1_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# Type1 driver sources (i.e., C files)
|
# Type1 driver sources (i.e., C files)
|
||||||
|
|
|
@ -20,7 +20,10 @@ T42_DIR := $(SRC_DIR)/type42
|
||||||
|
|
||||||
# compilation flags for the driver
|
# compilation flags for the driver
|
||||||
#
|
#
|
||||||
T42_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(T42_DIR))
|
T42_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(T42_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# Type42 driver source
|
# Type42 driver source
|
||||||
|
|
|
@ -18,7 +18,10 @@
|
||||||
FNT_DIR := $(SRC_DIR)/winfonts
|
FNT_DIR := $(SRC_DIR)/winfonts
|
||||||
|
|
||||||
|
|
||||||
FNT_COMPILE := $(FT_COMPILE) $I$(subst /,$(COMPILER_SEP),$(FNT_DIR))
|
FNT_COMPILE := $(CC) $(ANSIFLAGS) \
|
||||||
|
$I$(subst /,$(COMPILER_SEP),$(FNT_DIR)) \
|
||||||
|
$(INCLUDE_FLAGS) \
|
||||||
|
$(FT_CFLAGS)
|
||||||
|
|
||||||
|
|
||||||
# Windows driver sources (i.e., C files)
|
# Windows driver sources (i.e., C files)
|
||||||
|
|
Loading…
Reference in New Issue