[Fontconfig] fontconfig: Branch 'master'

[Keith Packard]

 fc-cache/Makefile.am |    4 ++--
 fc-cat/Makefile.am   |    4 ++--
 fc-list/Makefile.am  |    4 ++--
 fc-match/Makefile.am |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 32fed4572754c2d484cd1605ff273c3fbfbd09bb
Author: Keith Packard <keithp at keithp.com>
Date:   Tue Jan 8 12:34:19 2008 -0800

    Eliminate references to freetype from utility Makefile.am's
    
    The utility programs don't use any freetype interfaces, so they
    don't need to directly refer to freetype headers or libraries.

diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
index 538e197..b2be6bc 100644
--- a/fc-cache/Makefile.am
+++ b/fc-cache/Makefile.am
@@ -36,7 +36,7 @@ uninstall-local:
 	-$(RM) -rf "$(DESTDIR)$(fc_cachedir)"
 endif
 
-INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
+INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS)
 
 bin_PROGRAMS=fc-cache
 
@@ -44,7 +44,7 @@ man_MANS=fc-cache.1
 
 EXTRA_DIST=fc-cache.sgml $(man_MANS)
 
-fc_cache_LDADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) ${top_builddir}/src/libfontconfig.la
+fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la
 
 if USEDOCBOOK
 
diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am
index 2c44de5..245a75c 100644
--- a/fc-cat/Makefile.am
+++ b/fc-cat/Makefile.am
@@ -27,7 +27,7 @@ FC_CAT_SRC=${top_srcdir}/fc-cat
 
 SGML = ${FC_CAT_SRC}/fc-cat.sgml
 
-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
+INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
 
 bin_PROGRAMS=fc-cat
 
@@ -35,7 +35,7 @@ man_MANS=fc-cat.1
 
 EXTRA_DIST=fc-cat.sgml fc-cat.1
 
-fc_cat_LDADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) ${top_builddir}/src/libfontconfig.la
+fc_cat_LDADD = ${top_builddir}/src/libfontconfig.la
 
 if USEDOCBOOK
 
diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am
index 93867b7..dc9f410 100644
--- a/fc-list/Makefile.am
+++ b/fc-list/Makefile.am
@@ -29,13 +29,13 @@ SGML = ${FC_LIST_SRC}/fc-list.sgml
 
 bin_PROGRAMS=fc-list
 
-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
+INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
 
 man_MANS=fc-list.1
 
 EXTRA_DIST=fc-list.sgml $(man_MANS)
 
-fc_list_LDADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) ${top_builddir}/src/libfontconfig.la
+fc_list_LDADD = ${top_builddir}/src/libfontconfig.la
 
 if USEDOCBOOK
 
diff --git a/fc-match/Makefile.am b/fc-match/Makefile.am
index c5e77da..60e8649 100644
--- a/fc-match/Makefile.am
+++ b/fc-match/Makefile.am
@@ -29,13 +29,13 @@ FC_MATCH_SRC=${top_srcdir}/fc-match
 
 SGML = ${FC_MATCH_SRC}/fc-match.sgml
 
-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
+INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
 
 man_MANS=fc-match.1
 
 EXTRA_DIST=fc-match.sgml $(man_MANS)
 
-fc_match_LDADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) ${top_builddir}/src/libfontconfig.la
+fc_match_LDADD = ${top_builddir}/src/libfontconfig.la
 
 if USEDOCBOOK