diff options
author | Owen Taylor <otaylor@redhat.com> | 2001-05-16 18:38:30 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2001-05-16 18:38:30 +0000 |
commit | e6858b1b195339b72f61f6818657bd6b24a2cfc6 (patch) | |
tree | 0d35c4f619bf0fc97aa1f948872d1eb179d23677 /modules/tamil | |
parent | 6aeaa59a980fa68e2bbbd28cbe026919642a7fa9 (diff) | |
download | pango-e6858b1b195339b72f61f6818657bd6b24a2cfc6.tar.gz |
Require libtool 1.4 when build out of CVS.
Tue May 1 16:03:48 2001 Owen Taylor <otaylor@redhat.com>
* autogen.sh (libtool_version): Require libtool 1.4 when
build out of CVS.
* **/Makefile.am: Add inter-library dependencies,
especially for the modules. Many cleanups to the
module makefiles.
* configure.in modules/indic/Makefile.am: Remove
INCLUDE_ANY_INDIC conditional which doesn't seem to have
any point and was definitely suspect as done.
* modules/tamil/tamil-xft.c (MODULE_ENTRY): Fix prefix
to be _pango_tamil instead of _pango_basic.
* Makefile.am: Build modules/ after pango/ so we can
make the modules depend on libpango/libpangox.
* examples/Makefile.am: Remove spurious rule to rebuild
makefile.mingw.
Diffstat (limited to 'modules/tamil')
-rw-r--r-- | modules/tamil/Makefile.am | 22 | ||||
-rw-r--r-- | modules/tamil/tamil-xft.c | 2 |
2 files changed, 18 insertions, 6 deletions
diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am index a0bf102f..f0fb4e61 100644 --- a/modules/tamil/Makefile.am +++ b/modules/tamil/Makefile.am @@ -1,13 +1,20 @@ ## Process this file with automake to create Makefile.in. +pangolibs = $(top_builddir)/pango/libpango.la $(FRIBIDI_LIBS) $(GLIB_LIBS) +pangoxlibs = $(top_builddir)/pango/libpangox.la $(X_LIBS) $(pangolibs) +pangoxftlibs = $(top_builddir)/pango/libpangoxft.la $(XFT_LIBS) $(pangolibs) +pangoft2libs = $(top_builddir)/pango/libpangoft2.la $(FREETYPE_LIBS) $(pangolibs) + if HAVE_XFT -XFT_MODULES=pango-tamil-xft.la if INCLUDE_TAMIL_XFT +XFT_MODULES= XFT_INCLUDED=libpango-tamil-xft.la XFT_PREFIX=-DXFT_MODULE_PREFIX else +XFT_MODULES=pango-tamil-xft.la XFT_INCLUDED= XFT_PREFIX= +tamil_xft_libadd=$(pangoxftlibs) endif else XFT_MODULES= @@ -32,6 +39,7 @@ else X_MODULES=pango-tamil-x.la X_INCLUDED= X_PREFIX= +tamil_x_libadd=$(pangoxlibs) endif else X_MODULES= @@ -43,17 +51,21 @@ noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED) module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) moddefine = $(X_PREFIX) $(XFT_PREFIX) moduledir = $(libdir)/pango/modules -moduleflags=-rpath $(libdir) INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS) -pango_tamil_x_la_LDFLAGS = $(moduleflags) -export-dynamic -avoid-version -module +pango_tamil_x_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_tamil_x_la_LIBADD = $(tamil_x_libadd) pango_tamil_x_la_SOURCES = $(x_sources) libpango_tamil_x_la_SOURCES = $(x_sources) -pango_tamil_xft_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module -pango_tamil_xft_la_LIBADD = +pango_tamil_xft_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_tamil_xft_la_LIBADD = $(tamil_xft_libadd) pango_tamil_xft_la_SOURCES = $(xft_sources) libpango_tamil_xft_la_SOURCES = $(xft_sources) + +included-modules: $(noinst_LTLIBRARIES) + +.PHONY: included-modules diff --git a/modules/tamil/tamil-xft.c b/modules/tamil/tamil-xft.c index 647132c9..e1d32926 100644 --- a/modules/tamil/tamil-xft.c +++ b/modules/tamil/tamil-xft.c @@ -403,7 +403,7 @@ tamil_engine_xft_new () * Pango */ #ifdef XFT_MODULE_PREFIX -#define MODULE_ENTRY(func) _pango_basic_xft_##func +#define MODULE_ENTRY(func) _pango_tamil_xft_##func #else #define MODULE_ENTRY(func) func #endif |