X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=586594c1e024cfd5d8ed43e805c217f95da3aea6;hb=7ce196733129b0e664c1bdc20f973f15167292f7;hp=750b8d2a5f52d9d9a2ce22409995177ff48dc31c;hpb=f045376c0831f068e8fd8fd61773a5ed83dede7f;p=fontconfig.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 750b8d2..586594c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -63,8 +63,6 @@ uninstall-ms-import-lib:
 
 endif
 
-AM_CPPFLAGS = -DPKGCACHEDIR='"${pkgcachedir}"'
-
 INCLUDES = 						\
 	-I$(top_srcdir)					\
 	-I$(top_srcdir)/src				\
@@ -72,6 +70,7 @@ INCLUDES = 						\
 	$(LIBXML2_CFLAGS)				\
 	$(EXPAT_CFLAGS)					\
 	$(WARN_CFLAGS)					\
+	-DFC_CACHEDIR='"$(FC_CACHEDIR)"'                \
 	-DFONTCONFIG_PATH='"$(CONFDIR)"'
 
 EXTRA_DIST = fontconfig.def.in
@@ -96,6 +95,7 @@ libfontconfig_la_SOURCES = \
 	fcmatrix.c \
 	fcname.c \
 	fcpat.c \
+	fcserialize.c \
 	fcstr.c \
 	fcxml.c \
 	ftglue.h \
@@ -106,7 +106,7 @@ lib_LTLIBRARIES = libfontconfig.la
 libfontconfig_la_LDFLAGS =			\
 	-version-info @LT_VERSION_INFO@ -no-undefined $(export_symbols)
 
-libfontconfig_la_LIBADD = $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS)
+libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS)
 
 install-data-local: install-ms-import-lib install-libtool-import-lib