ref: c52b129ccdf7526429764026a5761b61cd32be4b
parent: fae382076409db198dfbff36ac4cbb97b05b30a1
author: Werner Lemberg <[email protected]>
date: Wed Nov 13 05:06:00 EST 2013
* builds/unix/ft2unix.h: Remove. No longer necessary. * builds/unix/install.mk (install): Updated.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2013-11-13 Werner Lemberg <[email protected]>
+ * builds/unix/ft2unix.h: Remove. No longer necessary.
+
+ * builds/unix/install.mk (install): Updated.
+
+2013-11-13 Werner Lemberg <[email protected]>
+
Simplify header file hierarchy.
This large patch changes the header file directory layout from
--- a/builds/unix/ft2unix.h
+++ /dev/null
@@ -1,40 +1,0 @@
-/***************************************************************************/
-/* */
-/* ft2build.h */
-/* */
-/* Build macros of the FreeType 2 library. */
-/* */
-/* Copyright 1996-2001, 2003, 2006 by */
-/* David Turner, Robert Wilhelm, and Werner Lemberg. */
-/* */
-/* This file is part of the FreeType project, and may only be used, */
-/* modified, and distributed under the terms of the FreeType project */
-/* license, LICENSE.TXT. By continuing to use, modify, or distribute */
-/* this file you indicate that you have read the license and */
-/* understand and accept it fully. */
-/* */
-/***************************************************************************/
-
-
- /*************************************************************************/
- /* */
- /* This is a Unix-specific version of <ft2build.h> that should be used */
- /* exclusively *after* installation of the library. */
- /* */
- /* It assumes that `/usr/local/include/freetype2' (or whatever is */
- /* returned by the `freetype-config --cflags' or `pkg-config --cflags' */
- /* command) is in your compilation include path. */
- /* */
- /*************************************************************************/
-
-
-#ifndef __FT2_BUILD_UNIX_H__
-#define __FT2_BUILD_UNIX_H__
-
- /* `<prefix>/include/freetype2' must be in your current inclusion path */
-#include <config/ftheader.h>
-
-#endif /* __FT2_BUILD_UNIX_H__ */
-
-
-/* END */
--- a/builds/unix/install.mk
+++ b/builds/unix/install.mk
@@ -48,8 +48,6 @@
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype/config
-$(DELETE) $(DESTDIR)$(includedir)/freetype2/freetype/*
-$(DELDIR) $(DESTDIR)$(includedir)/freetype2/freetype
- $(INSTALL_DATA) $(BUILD_DIR)/ft2unix.h \
- $(DESTDIR)$(includedir)/ft2build.h
$(INSTALL_DATA) $(OBJ_BUILD)/ftconfig.h \
$(DESTDIR)$(includedir)/freetype2/config/ftconfig.h
$(INSTALL_DATA) $(OBJ_DIR)/ftmodule.h \
--- a/devel/ft2build.h
+++ b/devel/ft2build.h
@@ -2,10 +2,9 @@
/* */
/* ft2build.h */
/* */
-/* FreeType 2 build and setup macros. */
-/* (Generic version) */
+/* FreeType 2 build and setup macros (development version). */
/* */
-/* Copyright 1996-2001, 2003, 2006 by */
+/* Copyright 1996-2001, 2003, 2006, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@@ -18,24 +17,24 @@
/*
- * This is a development version of <ft2build.h> that is used
- * to build the library in debug mode. Its only difference with
- * the reference is that it forces the use of the local `ftoption.h'
- * which contains different settings for all configuration macros.
+ * This is a development version of <ft2build.h> to build the library in
+ * debug mode. Its only difference to the default version is that it
+ * includes a local `ftoption.h' header file with different settings for
+ * many configuration macros.
*
- * To use it, you must define the environment variable FT2_BUILD_INCLUDE
- * to point to the directory containing these two files (`ft2build.h' and
- * `ftoption.h'), then invoke Jam as usual.
+ * To use it, simply ensure that the directory containing this file is
+ * scanned by the compiler before the default FreeType header directory.
+ *
*/
-#ifndef __FT2_BUILD_DEVEL_H__
-#define __FT2_BUILD_DEVEL_H__
+#ifndef __FT2BUILD_H__
+#define __FT2BUILD_H__
#define FT_CONFIG_OPTIONS_H <ftoption.h>
#include <config/ftheader.h>
-#endif /* __FT2_BUILD_DEVEL_H__ */
+#endif /* __FT2BUILD_H__ */
/* END */
--- a/include/ft2build.h
+++ b/include/ft2build.h
@@ -3,7 +3,6 @@
/* ft2build.h */
/* */
/* FreeType 2 build and setup macros. */
-/* (Generic version) */
/* */
/* Copyright 1996-2001, 2006, 2013 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
@@ -19,21 +18,25 @@
/*************************************************************************/
/* */
- /* This file corresponds to the default `ft2build.h' file for */
- /* FreeType 2. It uses the `freetype' include root. */
+ /* This is the `entry point' for FreeType header file inclusions. It is */
+ /* the only header file which should be included directly; all other */
+ /* FreeType header files should be accessed with macro names (after */
+ /* including `ft2build.h'). */
/* */
- /* Note that specific platforms might use a different configuration. */
- /* See builds/unix/ft2unix.h for an example. */
+ /* A typical example is */
/* */
+ /* #include <ft2build.h> */
+ /* #include FT_FREETYPE_H */
+ /* */
/*************************************************************************/
-#ifndef __FT2_BUILD_GENERIC_H__
-#define __FT2_BUILD_GENERIC_H__
+#ifndef __FT2BUILD_H__
+#define __FT2BUILD_H__
#include <config/ftheader.h>
-#endif /* __FT2_BUILD_GENERIC_H__ */
+#endif /* __FT2BUILD_H__ */
/* END */