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.
This commit is contained in:
parent
a0a1da22a4
commit
32fed45727
|
@ -36,7 +36,7 @@ uninstall-local:
|
||||||
-$(RM) -rf "$(DESTDIR)$(fc_cachedir)"
|
-$(RM) -rf "$(DESTDIR)$(fc_cachedir)"
|
||||||
endif
|
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
|
bin_PROGRAMS=fc-cache
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ man_MANS=fc-cache.1
|
||||||
|
|
||||||
EXTRA_DIST=fc-cache.sgml $(man_MANS)
|
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
|
if USEDOCBOOK
|
||||||
|
|
||||||
|
|
|
@ -27,7 +27,7 @@ FC_CAT_SRC=${top_srcdir}/fc-cat
|
||||||
|
|
||||||
SGML = ${FC_CAT_SRC}/fc-cat.sgml
|
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
|
bin_PROGRAMS=fc-cat
|
||||||
|
|
||||||
|
@ -35,7 +35,7 @@ man_MANS=fc-cat.1
|
||||||
|
|
||||||
EXTRA_DIST=fc-cat.sgml 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
|
if USEDOCBOOK
|
||||||
|
|
||||||
|
|
|
@ -29,13 +29,13 @@ SGML = ${FC_LIST_SRC}/fc-list.sgml
|
||||||
|
|
||||||
bin_PROGRAMS=fc-list
|
bin_PROGRAMS=fc-list
|
||||||
|
|
||||||
INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
|
INCLUDES=-I${top_srcdir} $(WARN_CFLAGS)
|
||||||
|
|
||||||
man_MANS=fc-list.1
|
man_MANS=fc-list.1
|
||||||
|
|
||||||
EXTRA_DIST=fc-list.sgml $(man_MANS)
|
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
|
if USEDOCBOOK
|
||||||
|
|
||||||
|
|
|
@ -29,13 +29,13 @@ FC_MATCH_SRC=${top_srcdir}/fc-match
|
||||||
|
|
||||||
SGML = ${FC_MATCH_SRC}/fc-match.sgml
|
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
|
man_MANS=fc-match.1
|
||||||
|
|
||||||
EXTRA_DIST=fc-match.sgml $(man_MANS)
|
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
|
if USEDOCBOOK
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue