diff options
| author | Werner Lemberg <wl@gnu.org> | 2013-11-13 08:55:46 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2013-11-13 08:55:46 +0100 |
| commit | fae382076409db198dfbff36ac4cbb97b05b30a1 (patch) | |
| tree | d1924a22a506a26999259c56e49ed9f7727a84e1 /builds/detect.mk | |
| parent | ea5c781afaba862426a077ace7382a3e5381f1b3 (diff) | |
| download | freetype2-fae382076409db198dfbff36ac4cbb97b05b30a1.tar.gz | |
Simplify header file hierarchy.
This large patch changes the header file directory layout from
`include/freetype/...' to `include/...', effectively removing one
level. Since the file `ft2build.h' is also located in `include'
(and it stays there even after installation), all FreeType header
files are now in a single directory.
Applications that use (a) `freetype-config' or FreeType's
`pkg-config' file to get the include directory for the compiler, and
(b) the documented way for header inclusion like
#include <ft2build.h>
#include FT_FREETYPE_H
...
don't need any change to the source code.
* include/freetype/*: Move up to...
* include/*: ... this directory.
* builds/amiga/include/freetype/*: Move up to...
* builds/amiga/include/*: ... this directory.
*/*: Essentially do `s@/freetype/@/@' where appropriate.
* CMakeList.txt: Simplify.
* builds/unix/freetype-config.in, builds/unix/freetype2.in: For
`--cflags', return a single directory.
* builds/unix/install.mk (install): No longer try to remove `cache'
and `internal' subdirectories; instead, remove the `freetype'
subdirectory.
Diffstat (limited to 'builds/detect.mk')
| -rw-r--r-- | builds/detect.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builds/detect.mk b/builds/detect.mk index 987ae51c4..ce407baf6 100644 --- a/builds/detect.mk +++ b/builds/detect.mk @@ -3,7 +3,7 @@ # -# Copyright 1996-2000, 2001, 2002, 2003, 2006, 2008 by +# Copyright 1996-2003, 2006, 2008, 2013 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -17,8 +17,8 @@ # the following variables: # # BUILD_DIR The configuration and system-specific directory. Usually -# `freetype/builds/$(PLATFORM)' but can be different for -# custom builds of the library. +# `builds/$(PLATFORM)' but can be different for custom builds +# of the library. # # The following variables must be defined in system specific `detect.mk' # files: |