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

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

15 files changed, 17 insertions, 17 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 1eb7f8ad..750b8d2a 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 8f25b2ce..7467f2d1 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 cf92a2f0..32e0084d 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 dcc84574..e0a09612 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 e5481890..9b7e8f7c 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 87f3b999..f31aef89 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 a9599ee3..fdc15d7c 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 3a742a89..9ce79527 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 38c20e00..452268b7 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 8d0fbc37..e3748e50 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 863fe692..3c4d9fb8 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 ed09597d..a5c8feec 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 658998bd..bc4270b6 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 c177e077..32c3a0a6 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 7deeb137..f92bf567 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