Commit f045376c authored by Patrick Lam's avatar Patrick Lam

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

Shuffle order of includes for building out of srcdir on win32.
reviewed by: plam
parent 55e145b0
......@@ -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>
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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>
......
......@@ -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
......
......@@ -22,8 +22,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#include <stdlib.h>
#include "fcint.h"
#include <stdlib.h>
/* #define CHECK */
......
......@@ -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)
......
......@@ -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
......
......@@ -22,8 +22,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#include <stdlib.h>
#include "fcint.h"
#include <stdlib.h>
FcFontSet *
FcFontSetCreate (void)
......
......@@ -22,8 +22,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#include <stdlib.h>
#include "fcint.h"
#include <stdlib.h>
static FcConfig *
FcInitFallbackConfig (void)
......
......@@ -22,8 +22,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
#include <stdlib.h>
#include "fcint.h"
#include <stdlib.h>
FcObjectSet *
FcObjectSetCreate (void)
......
......@@ -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
......
......@@ -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 };
......
......@@ -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
......
......@@ -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;
......
......@@ -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)
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment