diff options
| author | Werner Lemberg <wl@gnu.org> | 2015-06-22 06:35:23 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2015-06-22 06:35:23 +0200 |
| commit | 8502c98b15390a397de2d5826c9d8b017d7fc208 (patch) | |
| tree | 90d3ab5eaa2a7337e6782a0c3795ad0d4aea90e7 /builds/freetype.mk | |
| parent | 31d97df99fb8c7f52d19d675b8d497753f719594 (diff) | |
| download | freetype2-8502c98b15390a397de2d5826c9d8b017d7fc208.tar.gz | |
Fix Savannah bug #45097.
We no longer `pollute' the namespace of possible header file names;
instead we move `ft2build.h' up by one level so that it gets
installed in the default include directory (e.g.,
/usr/local/include). After this commit, only `ft2build.h' stays in
the compiler's include path.
No visible changes for the user who follows the standard FreeType
header inclusion rules.
* include/*: Move to ...
* include/freetype2/*: This directory, except `ft2build.h'.
* CMakeLists.txt (PUBLIC_HEADERS, PUBLIC_CONFIG_HEADERS,
PRIVATE_HEADERS), Jamfile (HDRMACRO, RefDoc), autogen.sh: Updated.
* builds/amiga/include/config/ftconfig.h, builds/freetype.mk
(PUBLIC_DIR), builds/symbian/bld.inf, builds/toplevel.mk (work),
builds/unix/install.mk (install, uninstall),
builds/unix/freetype2.in: Updated.
* builds/unix/freetype-config.in: Updated.
Emit -I directory only if it is not `/usr/include'.
* builds/wince/*, builds/windows/*: Updated.
* devel/ft2build.h, include/ft2build.h: Updated.
* include/freetype2/config/ftheader.h,
include/freetype2/internal/ftserv.h,
include/freetype2/internal/internal.h: Update all header file
macros.
* src/tools/chktrcmp.py (TRACE_DEF_FILES): Updated.
* docs/*: Updated.
Diffstat (limited to 'builds/freetype.mk')
| -rw-r--r-- | builds/freetype.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builds/freetype.mk b/builds/freetype.mk index 5ea13f058..7f9e056be 100644 --- a/builds/freetype.mk +++ b/builds/freetype.mk @@ -97,7 +97,7 @@ BASE_DIR := $(SRC_DIR)/base # Other derived directories. # -PUBLIC_DIR := $(TOP_DIR)/include +PUBLIC_DIR := $(TOP_DIR)/include/freetype2 INTERNAL_DIR := $(PUBLIC_DIR)/internal SERVICES_DIR := $(INTERNAL_DIR)/services CONFIG_DIR := $(PUBLIC_DIR)/config @@ -175,7 +175,7 @@ OBJECTS_LIST := # Define $(PUBLIC_H) as the list of all public header files located in -# `$(TOP_DIR)/include/freetype'. $(INTERNAL_H), and $(CONFIG_H) are defined +# `$(TOP_DIR)/include/freetype2'. $(INTERNAL_H), and $(CONFIG_H) are defined # similarly. # # This is used to simplify the dependency rules -- if one of these files |