Add warning flags to fc-cache build. Clean up warnings in fc-cache.

[fontconfig.git] / fc-cache / Makefile.am

diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am
index 798506f2680bb4a4f9b655e8f1b87a1b3a6c5912..26ca40de5d22015dc8595735eb262ef2b160510a 100644 (file)
--- a/fc-cache/Makefile.am
+++ b/fc-cache/Makefile.am
@@ -27,21 +27,19 @@ FC_CACHE_SRC=${top_srcdir}/fc-cache
 
 SGML = ${FC_CACHE_SRC}/fc-cache.sgml
 
-AM_CPPFLAGS = -DPKGCACHEDIR='"${pkgcachedir}"'
-
 install-data-local:
-       $(mkinstalldirs) "$(DESTDIR)$(pkgcachedir)"
+       -$(mkinstalldirs) "$(DESTDIR)$(fc_cachedir)"
 
 uninstall-local:
-       $(RM) -rf "$(DESTDIR)$(pkgcachedir)"
+       -$(RM) -rf "$(DESTDIR)$(fc_cachedir)"
 
-INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS)
+INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(FREETYPE_CFLAGS) $(WARN_CFLAGS)
 
 bin_PROGRAMS=fc-cache
 
-EXTRA_DIST=$(SGML)
+EXTRA_DIST=fc-cache.sgml
 
-fc_cache_LDADD = ${top_builddir}/src/libfontconfig.la
+fc_cache_LDADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS) ${top_builddir}/src/libfontconfig.la
 
 if USEDOCBOOK