Include $(top_srcdir), $(top_srcdir)/src before anything else.

Shuffle order of includes for building out of srcdir on win32.
reviewed by: plam

diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index ce6b567ce92e6b92ce064261640a4899f8713b5d..5e4ada40c0ad91eaa49457e42d681b722cfef7ed 100644 (file)
--- 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 09b20f66bf77dd94d052874627c354d46500ebea..cf3632325f4fd7a1e924e429cf2db1d566ed0d9a 100644 (file)
--- 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 fa45018d55589f04f7fe7249470a9ff1b0d22550..d9742c97ea22298e1ab3103b28fbc4b68f549ab5 100644 (file)
--- 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 1eb7f8adf6e6beb040f0cf0445045e1931da1d0b..750b8d2a5f52d9d9a2ce22409995177ff48dc31c 100644 (file)
--- 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 8f25b2cef6a7d809cddbfa9b0d38214e38ead0c4..7467f2d1cd7dbd07f46d09f0b6c254a199f850b6 100644 (file)
--- 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 cf92a2f0a5a4493e355ef05f517c09eca415e296..32e0084d9d3894b475f95e2db5611521afd3d76e 100644 (file)
--- 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 dcc84574cd16ac4e97dd2f070e6dd1cc6b4fba2b..e0a09612859857e4bd557d3ebff890b62f2d8c0f 100644 (file)
--- 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 e5481890fa7245a4abdcafcd8c0755fc7d419d3e..9b7e8f7c9ba551043d978788d2f857f34ebd1c18 100644 (file)
--- 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 87f3b999e2a663ea947066e76f80120b41893de2..f31aef893a1a44f8169e44895fedddf840e9acb3 100644 (file)
--- 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 a9599ee3ca61afcb55214caf27966f730d0bc0c0..fdc15d7c2f7ed2d1cb8ed7af03795c0314e8a3d2 100644 (file)
--- 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 3a742a892e24639d2ada2c4e6460a93d1d16622d..9ce795273fd0e4fb00fe52182ea9fdb3abee3090 100644 (file)
--- 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 38c20e00db58f35cf9591f1c52d97b78f316e763..452268b789e6c757faf58d57d696e2d6b80c34f9 100644 (file)
--- 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 8d0fbc37ffe2e1a318347f229657d96e843fc7bd..e3748e50aaf76418360087561eef7e012347f3ad 100644 (file)
--- 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 863fe692c9056a84aa5676d1114048ca7b8ef635..3c4d9fb84a1e332170dc895fcb1813cd9be79cc9 100644 (file)
--- 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 ed09597d94a5265a092f7f3b6d536393740a2cd0..a5c8feec9914c262ea9e280286933deb0f31f546 100644 (file)
--- 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 658998bd891960ef1db44a155c7ed33e594292ef..bc4270b68052a348b6a0060ec0d45c3155d9ec01 100644 (file)
--- 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 c177e0774a69a2036bcd21a45d8f36a302afd923..32c3a0a6d98bb44e0f6a700b8074499106936abf 100644 (file)
--- 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 7deeb137863a90b7e5a99ce7ba72bb45392964a1..f92bf567ce36a6a1b5416e793290d6ff3a045b58 100644 (file)
--- 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