Make room for chunks from fonts.conf in conf.avail

[fontconfig.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 1891c3c900a779d34b2ddf1db39c2c47b34bbfcd..586594c1e024cfd5d8ed43e805c217f95da3aea6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,6 @@
 
 if OS_WIN32
 
-no_undefined = -no-undefined
 export_symbols = -export-symbols fontconfig.def
 
 # gcc import library install/uninstall
@@ -65,12 +64,14 @@ uninstall-ms-import-lib:
 endif
 
 INCLUDES =                                             \
+       -I$(top_srcdir)                                 \
+       -I$(top_srcdir)/src                             \
        $(FREETYPE_CFLAGS)                              \
+       $(LIBXML2_CFLAGS)                               \
        $(EXPAT_CFLAGS)                                 \
        $(WARN_CFLAGS)                                  \
-       -DFONTCONFIG_PATH='"$(CONFDIR)"'                \
-       -I$(top_srcdir)                                 \
-       -I$(top_srcdir)/src
+       -DFC_CACHEDIR='"$(FC_CACHEDIR)"'                \
+       -DFONTCONFIG_PATH='"$(CONFDIR)"'
 
 EXTRA_DIST = fontconfig.def.in
 
@@ -94,15 +95,18 @@ libfontconfig_la_SOURCES = \
        fcmatrix.c \
        fcname.c \
        fcpat.c \
+       fcserialize.c \
        fcstr.c \
-       fcxml.c
+       fcxml.c \
+       ftglue.h \
+       ftglue.c
 
 lib_LTLIBRARIES = libfontconfig.la
 
 libfontconfig_la_LDFLAGS =                     \
-       -version-info @LT_VERSION_INFO@ $(no_undefined) $(export_symbols)
+       -version-info @LT_VERSION_INFO@ -no-undefined $(export_symbols)
 
-libfontconfig_la_LIBADD = $(FREETYPE_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