From f045376c0831f068e8fd8fd61773a5ed83dede7f Mon Sep 17 00:00:00 2001
From: Patrick Lam <plam@MIT.EDU>
Date: Tue, 25 Apr 2006 05:57:41 +0000
Subject: [PATCH] Include $(top_srcdir), $(top_srcdir)/src before anything
 else. Shuffle order of includes for building out of srcdir on win32. reviewed
 by: plam

---
 fc-cache/fc-cache.c | 15 ++++++++-------
 fc-cat/fc-cat.c     | 17 +++++++++--------
 fc-match/fc-match.c | 11 ++++++-----
 src/Makefile.am     |  6 +++---
 src/fccache.c       |  2 +-
 src/fccfg.c         |  2 +-
 src/fccharset.c     |  2 +-
 src/fcdbg.c         |  2 +-
 src/fcfreetype.c    |  2 +-
 src/fcfs.c          |  2 +-
 src/fcinit.c        |  2 +-
 src/fclist.c        |  2 +-
 src/fcmatch.c       |  2 +-
 src/fcmatrix.c      |  2 +-
 src/fcname.c        |  2 +-
 src/fcpat.c         |  2 +-
 src/fcstr.c         |  2 +-
 src/fcxml.c         |  2 +-
 18 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index ce6b567..5e4ada4 100644
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -22,13 +22,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <fontconfig/fontconfig.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #else
@@ -38,6 +31,14 @@
 #define HAVE_GETOPT 1
 #endif
 
+#include <fontconfig/fontconfig.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
 #if defined (_WIN32)
 #define STRICT
 #include <windows.h>
diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
index 09b20f6..cf36323 100644
--- a/fc-cat/fc-cat.c
+++ b/fc-cat/fc-cat.c
@@ -22,14 +22,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <fontconfig/fontconfig.h>
-#include <../src/fccache.c>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <errno.h>
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #else
@@ -39,6 +31,15 @@
 #define HAVE_GETOPT 1
 #endif
 
+#include <fontconfig/fontconfig.h>
+#include <../src/fccache.c>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
 #ifndef HAVE_GETOPT
 #define HAVE_GETOPT 0
 #endif
diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c
index fa45018..d9742c9 100644
--- a/fc-match/fc-match.c
+++ b/fc-match/fc-match.c
@@ -22,11 +22,6 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <fontconfig/fontconfig.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #else
@@ -36,6 +31,12 @@
 #define HAVE_GETOPT 1
 #endif
 
+#include <fontconfig/fontconfig.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+
 #ifndef HAVE_GETOPT
 #define HAVE_GETOPT 0
 #endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 1eb7f8a..750b8d2 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -66,13 +66,13 @@ endif
 AM_CPPFLAGS = -DPKGCACHEDIR='"${pkgcachedir}"'
 
 INCLUDES = 						\
+	-I$(top_srcdir)					\
+	-I$(top_srcdir)/src				\
 	$(FREETYPE_CFLAGS)				\
 	$(LIBXML2_CFLAGS)				\
 	$(EXPAT_CFLAGS)					\
 	$(WARN_CFLAGS)					\
-	-DFONTCONFIG_PATH='"$(CONFDIR)"'		\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/src
+	-DFONTCONFIG_PATH='"$(CONFDIR)"'
 
 EXTRA_DIST = fontconfig.def.in
 
diff --git a/src/fccache.c b/src/fccache.c
index 8f25b2c..7467f2d 100644
--- a/src/fccache.c
+++ b/src/fccache.c
@@ -23,11 +23,11 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "fcint.h"
 #include <fcntl.h>
 #include <dirent.h>
 #include <string.h>
 #include <sys/types.h>
-#include "fcint.h"
 #if defined(HAVE_MMAP) || defined(__CYGWIN__)
 #  include <unistd.h>
 #  include <sys/mman.h>
diff --git a/src/fccfg.c b/src/fccfg.c
index cf92a2f..32e0084 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -22,9 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "fcint.h"
 #include <dirent.h>
 #include <sys/types.h>
-#include "fcint.h"
 
 #if defined (_WIN32) && (defined (PIC) || defined (DLL_EXPORT))
 #define STRICT
diff --git a/src/fccharset.c b/src/fccharset.c
index dcc8457..e0a0961 100644
--- a/src/fccharset.c
+++ b/src/fccharset.c
@@ -22,8 +22,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
 #include "fcint.h"
+#include <stdlib.h>
 
 /* #define CHECK */
 
diff --git a/src/fcdbg.c b/src/fcdbg.c
index e548189..9b7e8f7 100644
--- a/src/fcdbg.c
+++ b/src/fcdbg.c
@@ -22,9 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "fcint.h"
 #include <stdio.h>
 #include <stdlib.h>
-#include "fcint.h"
 
 void
 FcValuePrint (const FcValue v)
diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 87f3b99..f31aef8 100644
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -44,10 +44,10 @@
   THE SOFTWARE.
 */
 
+#include "fcint.h"
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "fcint.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include FT_TRUETYPE_TABLES_H
diff --git a/src/fcfs.c b/src/fcfs.c
index a9599ee..fdc15d7 100644
--- a/src/fcfs.c
+++ b/src/fcfs.c
@@ -22,8 +22,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
 #include "fcint.h"
+#include <stdlib.h>
 
 FcFontSet *
 FcFontSetCreate (void)
diff --git a/src/fcinit.c b/src/fcinit.c
index 3a742a8..9ce7952 100644
--- a/src/fcinit.c
+++ b/src/fcinit.c
@@ -22,8 +22,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
 #include "fcint.h"
+#include <stdlib.h>
 
 static FcConfig *
 FcInitFallbackConfig (void)
diff --git a/src/fclist.c b/src/fclist.c
index 38c20e0..452268b 100644
--- a/src/fclist.c
+++ b/src/fclist.c
@@ -22,8 +22,8 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <stdlib.h>
 #include "fcint.h"
+#include <stdlib.h>
 
 FcObjectSet *
 FcObjectSetCreate (void)
diff --git a/src/fcmatch.c b/src/fcmatch.c
index 8d0fbc3..e3748e5 100644
--- a/src/fcmatch.c
+++ b/src/fcmatch.c
@@ -22,9 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "fcint.h"
 #include <string.h>
 #include <ctype.h>
-#include "fcint.h"
 #include <stdio.h>
 
 static double
diff --git a/src/fcmatrix.c b/src/fcmatrix.c
index 863fe69..3c4d9fb 100644
--- a/src/fcmatrix.c
+++ b/src/fcmatrix.c
@@ -22,10 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "fcint.h"
 #include <math.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include "fcint.h"
 
 const FcMatrix    FcIdentityMatrix = { 1, 0, 0, 1 };
 
diff --git a/src/fcname.c b/src/fcname.c
index ed09597..a5c8fee 100644
--- a/src/fcname.c
+++ b/src/fcname.c
@@ -22,11 +22,11 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "fcint.h"
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include "fcint.h"
 
 /* Please do not revoke any of these bindings. */
 /* The __DUMMY__ object enables callers to distinguish the error return
diff --git a/src/fcpat.c b/src/fcpat.c
index 658998b..bc4270b 100644
--- a/src/fcpat.c
+++ b/src/fcpat.c
@@ -22,10 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "fcint.h"
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "fcint.h"
 
 static FcPattern ** _fcPatterns = 0;
 static int fcpattern_bank_count = 0, fcpattern_ptr, fcpattern_count;
diff --git a/src/fcstr.c b/src/fcstr.c
index c177e07..32c3a0a 100644
--- a/src/fcstr.c
+++ b/src/fcstr.c
@@ -22,10 +22,10 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "fcint.h"
 #include <stdlib.h>
 #include <ctype.h>
 #include <string.h>
-#include "fcint.h"
 
 FcChar8 *
 FcStrCopy (const FcChar8 *s)
diff --git a/src/fcxml.c b/src/fcxml.c
index 7deeb13..f92bf56 100644
--- a/src/fcxml.c
+++ b/src/fcxml.c
@@ -22,9 +22,9 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include "fcint.h"
 #include <fcntl.h>
 #include <stdarg.h>
-#include "fcint.h"
 #include <dirent.h>
 
 #ifdef ENABLE_LIBXML2
-- 
2.39.5