3 files changed, 9 insertions, 6 deletions
diff --git a/lib/fontconfig/conf.d/Makefile.in b/lib/fontconfig/conf.d/Makefile.in
index 6737ce551..00f0690dc 100644
--- a/lib/fontconfig/conf.d/Makefile.in
+++ b/lib/fontconfig/conf.d/Makefile.in
@@ -257,6 +257,7 @@ CONF_FILES = \
 	90-synthetic.conf
 
 CONF_LINKS = \
+	10-autohint.conf \
 	20-fix-globaladvance.conf \
 	20-lohit-gujarati.conf \
 	20-unhint-small-vera.conf \
diff --git a/lib/fontconfig/fc-list/Makefile.in b/lib/fontconfig/fc-list/Makefile.in
index 21def8255..ef4898deb 100644
--- a/lib/fontconfig/fc-list/Makefile.in
+++ b/lib/fontconfig/fc-list/Makefile.in
@@ -75,8 +75,9 @@ PROGRAMS = $(bin_PROGRAMS)
 fc_list_SOURCES = fc-list.c
 fc_list_OBJECTS = fc-list.$(OBJEXT)
 am__DEPENDENCIES_1 =
-fc_list_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) ${top_builddir}/src/libfontconfig.la
+fc_list_DEPENDENCIES = ${top_builddir}/src/libfontconfig.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -250,7 +251,7 @@ FC_LIST_SRC = ${top_srcdir}/fc-list
 SGML = ${FC_LIST_SRC}/fc-list.sgml
 INCLUDES = -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
 EXTRA_DIST = fc-list.sgml
-fc_list_LDADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) ${top_builddir}/src/libfontconfig.la
+fc_list_LDADD = ${top_builddir}/src/libfontconfig.la $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS)
 @USEDOCBOOK_TRUE@man_MANS = fc-list.1
 all: all-am
 
diff --git a/lib/fontconfig/fc-match/Makefile.in b/lib/fontconfig/fc-match/Makefile.in
index 9f9407b20..2b99ddc8c 100644
--- a/lib/fontconfig/fc-match/Makefile.in
+++ b/lib/fontconfig/fc-match/Makefile.in
@@ -75,8 +75,9 @@ PROGRAMS = $(bin_PROGRAMS)
 fc_match_SOURCES = fc-match.c
 fc_match_OBJECTS = fc-match.$(OBJEXT)
 am__DEPENDENCIES_1 =
-fc_match_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) ${top_builddir}/src/libfontconfig.la
+fc_match_DEPENDENCIES = ${top_builddir}/src/libfontconfig.la \
+	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -250,7 +251,7 @@ FC_MATCH_SRC = ${top_srcdir}/fc-match
 SGML = ${FC_MATCH_SRC}/fc-match.sgml
 INCLUDES = -I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
 EXTRA_DIST = fc-match.sgml
-fc_match_LDADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) ${top_builddir}/src/libfontconfig.la
+fc_match_LDADD = ${top_builddir}/src/libfontconfig.la $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS)
 @USEDOCBOOK_TRUE@man_MANS = fc-match.1
 all: all-am