Deal with libtool 2.2 which doesn't let us use LT_ variables. (bug 15692)

[fontconfig.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index a7d6b92f39cddc584133ad8b0ff73d4311a2dfa8..a71ef1dd953fd515027902ee7d171729c070673f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -79,7 +79,7 @@ INCLUDES =                                            \
 
 EXTRA_DIST = makealias
 
-noinst_HEADERS=fcint.h fcdeprecate.h
+noinst_HEADERS=fcint.h fcftint.h fcdeprecate.h
 
 ALIAS_FILES = fcalias.h fcaliastail.h fcftalias.h fcftaliastail.h
 
@@ -112,7 +112,7 @@ libfontconfig_la_SOURCES = \
 lib_LTLIBRARIES = libfontconfig.la
 
 libfontconfig_la_LDFLAGS =                     \
-       -version-info @LT_VERSION_INFO@ -no-undefined $(export_symbols)
+       -version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
 
 libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS)
 
@@ -140,14 +140,14 @@ fcftaliastail.h: fcftalias.h
 fcftalias.h: $(top_srcdir)/src/makealias $(PUBLIC_FT_FILES)
        sh $(top_srcdir)/src/makealias "$(top_srcdir)/src" fcftalias.h fcftaliastail.h $(PUBLIC_FT_FILES)
 
-CLEANFILES := $(ALIAS_FILES)
+CLEANFILES = $(ALIAS_FILES)
 
-fontconfig.def: $(PUBLIC_FILES)
+fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES)
        echo Generating $@
        (echo EXPORTS; \
-       (cat $(PUBLIC_FILES) || echo 'FcERROR ()' ) | \
+       (cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \
        grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' -e 's/^/      /' | \
        sort; \
-       echo LIBRARY libfontconfig-@LT_CURRENT_MINUS_AGE@.dll; \
-       echo VERSION @LT_CURRENT@.@LT_REVISION@) >$@
+       echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
+       echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@
        @ ! grep -q FcERROR $@ || ($(RM) $@; false)