diff options
| author | Werner Lemberg <wl@gnu.org> | 2015-01-12 11:26:30 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2015-01-12 11:26:30 +0100 |
| commit | 36d03c9f583f4c4b2ad2870784e2fe50814820c9 (patch) | |
| tree | bf6d3c79734b08ae66e00de3de19576b7f434b58 /src/type1/rules.mk | |
| parent | 2af74c9b87d4a35f019d54ad89c9ef1c2208f7bb (diff) | |
| download | freetype2-36d03c9f583f4c4b2ad2870784e2fe50814820c9.tar.gz | |
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.
Diffstat (limited to 'src/type1/rules.mk')
| -rw-r--r-- | src/type1/rules.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/type1/rules.mk b/src/type1/rules.mk index 15087b030..160946a2e 100644 --- a/src/type1/rules.mk +++ b/src/type1/rules.mk @@ -20,7 +20,10 @@ T1_DIR := $(SRC_DIR)/type1 # 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) |