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 /devel | |
| 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 'devel')
| -rw-r--r-- | devel/ft2build.h | 4 | ||||
| -rw-r--r-- | devel/ftoption.h | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/devel/ft2build.h b/devel/ft2build.h index c1d38c35a..0f586d956 100644 --- a/devel/ft2build.h +++ b/devel/ft2build.h @@ -31,9 +31,9 @@ #ifndef __FT2_BUILD_DEVEL_H__ #define __FT2_BUILD_DEVEL_H__ -#define FT_CONFIG_OPTIONS_H <ftoption.h> +#define FT_CONFIG_OPTIONS_H <ftoption.h> -#include <freetype/config/ftheader.h> +#include <config/ftheader.h> #endif /* __FT2_BUILD_DEVEL_H__ */ diff --git a/devel/ftoption.h b/devel/ftoption.h index 220625df9..27d1bd9a5 100644 --- a/devel/ftoption.h +++ b/devel/ftoption.h @@ -38,9 +38,9 @@ FT_BEGIN_HEADER /* library from a single source directory. */ /* */ /* - You can put a copy of this file in your build directory, more */ - /* precisely in `$BUILD/freetype/config/ftoption.h', where `$BUILD' */ - /* is the name of a directory that is included _before_ the FreeType */ - /* include path during compilation. */ + /* precisely in `$BUILD/config/ftoption.h', where `$BUILD' is the */ + /* name of a directory that is included _before_ the FreeType include */ + /* path during compilation. */ /* */ /* The default FreeType Makefiles and Jamfiles use the build */ /* directory `builds/<system>' by default, but you can easily change */ @@ -51,7 +51,7 @@ FT_BEGIN_HEADER /* locate this file during the build. For example, */ /* */ /* #define FT_CONFIG_OPTIONS_H <myftoptions.h> */ - /* #include <freetype/config/ftheader.h> */ + /* #include <config/ftheader.h> */ /* */ /* will use `$BUILD/myftoptions.h' instead of this file for macro */ /* definitions. */ @@ -59,7 +59,7 @@ FT_BEGIN_HEADER /* Note also that you can similarly pre-define the macro */ /* FT_CONFIG_MODULES_H used to locate the file listing of the modules */ /* that are statically linked to the library at compile time. By */ - /* default, this file is <freetype/config/ftmodule.h>. */ + /* default, this file is <config/ftmodule.h>. */ /* */ /* We highly recommend using the third method whenever possible. */ /* */ @@ -528,7 +528,7 @@ FT_BEGIN_HEADER /* does not contain any glyph name though. */ /* */ /* Accessing SFNT names is done through the functions declared in */ - /* `freetype/ftsnames.h'. */ + /* `ftsnames.h'. */ /* */ #define TT_CONFIG_OPTION_SFNT_NAMES |