vast clean-up of the sources in order to allow flat

directory compilation (by defining the FT_FLAT_COMPILE
macro at compile time..)

moved "freetype2/BUILD" to "freetype2/docs/BUILD"

9 files changed, 90 insertions, 27 deletions

diff --git a/src/sfnt/rules.mk b/src/sfnt/rules.mk
index e3b0bbdd3..2255e6a08 100644
--- a/src/sfnt/rules.mk
+++ b/src/sfnt/rules.mk
@@ -19,14 +19,9 @@ SFNT_DIR  := $(SRC_)sfnt
 SFNT_DIR_ := $(SFNT_DIR)$(SEP)
 
 
-# additional include flags used when compiling the driver
-#
-SFNT_INCLUDE := $(SFNT_DIR)
-
 # compilation flags for the driver
 #
-SFNT_CFLAGS  := $(SFNT_INCLUDE:%=$I%)
-SFNT_COMPILE := $(FT_COMPILE) $(SFNT_CFLAGS)
+SFNT_COMPILE := $(FT_COMPILE)
 
 
 # SFNT driver sources (i.e., C files)
diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c
index fe0a271ae..758d53a89 100644
--- a/src/sfnt/sfdriver.c
+++ b/src/sfnt/sfdriver.c
@@ -18,12 +18,23 @@
 
 #include <freetype/internal/sfnt.h>
 #include <freetype/internal/ftobjs.h>
-#include <sfdriver.h>
-#include <ttload.h>
-#include <ttsbit.h>
-#include <ttpost.h>
-#include <ttcmap.h>
-#include <sfobjs.h>
+
+#ifdef FT_FLAT_COMPILE
+#include "sfdriver.h"
+#include "ttload.h"
+#include "ttsbit.h"
+#include "ttpost.h"
+#include "ttcmap.h"
+#include "sfobjs.h"
+#else
+#include <sfnt/sfdriver.h>
+#include <sfnt/ttload.h>
+#include <sfnt/ttsbit.h>
+#include <sfnt/ttpost.h>
+#include <sfnt/ttcmap.h>
+#include <sfnt/sfobjs.h>
+#endif
+
 
 #include <string.h>     /* for strcmp() */
 
diff --git a/src/sfnt/sfnt.c b/src/sfnt/sfnt.c
index a9aa1826a..a87158d49 100644
--- a/src/sfnt/sfnt.c
+++ b/src/sfnt/sfnt.c
@@ -18,19 +18,41 @@
 
 #define FT_MAKE_OPTION_SINGLE_OBJECT
 
-#include <ttload.c>
-#include <ttcmap.c>
-#include <sfobjs.c>
+#ifdef FT_FLAT_COMPILE
+
+#include "ttload.c"
+#include "ttcmap.c"
+#include "sfobjs.c"
 
 #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
-#include <ttsbit.c>
+#include "ttsbit.c"
 #endif
 
 #ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
-#include <ttpost.c>
+#include "ttpost.c"
+#endif
+#include "sfdriver.c"
+
+
+#else /* FT_FLAT_COMPILE */
+
+#include <sfnt/ttload.c>
+#include <sfnt/ttcmap.c>
+#include <sfnt/sfobjs.c>
+
+#ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS
+#include <sfnt/ttsbit.c>
 #endif
 
-#include <sfdriver.c>
+#ifdef TT_CONFIG_OPTION_POSTSCRIPT_NAMES
+#include <sfnt/ttpost.c>
+#endif
+#include <sfnt/sfdriver.c>
+
+#endif   /* FT_FLAT_COMPILE */
+
+
+
 
 
 /* END */
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index 87cc0ccec..98b38c1ed 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -16,7 +16,12 @@
 /***************************************************************************/
 
 
-#include <sfobjs.h>
+#ifdef FT_FLAT_COMPILE
+#include "sfobjs.h"
+#else
+#include <sfnt/sfobjs.h>
+#endif
+
 #include <freetype/internal/sfnt.h>
 #include <freetype/internal/psnames.h>
 #include <freetype/ttnameid.h>
diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c
index f15963ead..798285000 100644
--- a/src/sfnt/ttcmap.c
+++ b/src/sfnt/ttcmap.c
@@ -19,8 +19,15 @@
 #include <freetype/internal/ftdebug.h>
 #include <freetype/internal/tterrors.h>
 
-#include <ttload.h>
-#include <ttcmap.h>
+#ifdef FT_FLAT_COMPILE
+#include "ttload.h"
+#include "ttcmap.h"
+#else
+#include <sfnt/ttload.h>
+#include <sfnt/ttcmap.h>
+#endif
+
+
 
 
   /*************************************************************************/
diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c
index a8557201d..e316beb02 100644
--- a/src/sfnt/ttload.c
+++ b/src/sfnt/ttload.c
@@ -21,8 +21,15 @@
 #include <freetype/internal/tterrors.h>
 #include <freetype/tttags.h>
 
-#include <ttload.h>
-#include <ttcmap.h>
+#ifdef FT_FLAT_COMPILE
+#include "ttload.h"
+#include "ttcmap.h"
+#else
+#include <sfnt/ttload.h>
+#include <sfnt/ttcmap.h>
+#endif
+
+
 
 
   /*************************************************************************/
diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c
index d613174fb..4151a6c5b 100644
--- a/src/sfnt/ttpost.c
+++ b/src/sfnt/ttpost.c
@@ -29,8 +29,14 @@
 #include <freetype/internal/tterrors.h>
 #include <freetype/tttags.h>
 
-#include <ttpost.h>
-#include <ttload.h>
+#ifdef FT_FLAT_COMPILE
+#include "ttpost.h"
+#include "ttload.h"
+#else
+#include <sfnt/ttpost.h>
+#include <sfnt/ttload.h>
+#endif
+
 
 
   /*************************************************************************/
diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c
index f6ed29abf..34c548030 100644
--- a/src/sfnt/ttsbit.c
+++ b/src/sfnt/ttsbit.c
@@ -20,7 +20,12 @@
 #include <freetype/internal/tterrors.h>
 #include <freetype/tttags.h>
 
-#include <ttsbit.h>
+#ifdef FT_FLAT_COMPILE
+#include "ttsbit.h"
+#else
+#include <sfnt/ttsbit.h>
+#endif
+
 
 
   /*************************************************************************/
diff --git a/src/sfnt/ttsbit.h b/src/sfnt/ttsbit.h
index 7992a7d1b..fcfec06a8 100644
--- a/src/sfnt/ttsbit.h
+++ b/src/sfnt/ttsbit.h
@@ -19,7 +19,12 @@
 #ifndef TTSBIT_H
 #define TTSBIT_H
 
-#include <ttload.h>
+#ifdef FT_FLAT_COMPILE
+#include "ttload.h"
+#else
+#include <sfnt/ttload.h>
+#endif
+
 
 
 #ifdef __cplusplus