X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=src%2FMakefile.am;h=126d01a5aa90b757c2627456fc6006ca480bcf05;hb=08bef687018f2391c2f2b6fc3849878c121b67dd;hp=8247b97caca633244f1fd56f324c4e4232d0a74c;hpb=1ed67f658c910ece44ab73bb5a1d08ea1c0246d3;p=fontconfig.git

diff --git a/src/Makefile.am b/src/Makefile.am
index 8247b97..126d01a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -64,18 +64,23 @@ 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
+EXTRA_DIST = fontconfig.def.in makealias
 
 noinst_HEADERS=fcint.h
 
+ALIAS_FILES = fcalias.h fcaliastail.h
+
+BUILT_SOURCES = $(ALIAS_FILES)
+
 libfontconfig_la_SOURCES = \
 	fcatomic.c \
 	fcblanks.c \
@@ -94,17 +99,31 @@ 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) $(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
 
 uninstall-local: uninstall-ms-import-lib uninstall-libtool-import-lib
 
+PUBLIC_FILES = \
+	$(top_srcdir)/fontconfig/fontconfig.h \
+	$(top_srcdir)/fontconfig/fcfreetype.h \
+	$(top_srcdir)/fontconfig/fcprivate.h
+	
+fcaliastail.h: fcalias.h
+
+fcalias.h: $(top_srcdir)/src/makealias $(PUBLIC_FILES)
+	sh $(top_srcdir)/src/makealias "$(top_srcdir)/src" $(PUBLIC_FILES)
+
+CLEANFILES := $(ALIAS_FILES)