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/thai | |
| 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/thai')
| -rw-r--r-- | modules/thai/Makefile.am | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am index 3b22ed78..fc4e4a98 100644 --- a/modules/thai/Makefile.am +++ b/modules/thai/Makefile.am @@ -2,6 +2,11 @@ sources = thai-x.c +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_X if INCLUDE_THAI_X noinst_LTLIBRARIES = libpango-thai-x.la @@ -9,15 +14,18 @@ moddefine = -DX_MODULE_PREFIX else moduledir = $(libdir)/pango/modules module_LTLIBRARIES = pango-thai-x.la -moduleflags=-rpath $(libdir) +thai_x_libadd=$(pangoxlibs) endif endif INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) -pango_thai_x_la_LDFLAGS = $(moduleflags) -export-dynamic -avoid-version -module -pango_thai_x_la_LIBADD = +pango_thai_x_la_LDFLAGS = -export-dynamic -avoid-version -module +pango_thai_x_la_LIBADD = $(thai_x_libadd) pango_thai_x_la_SOURCES = $(sources) libpango_thai_x_la_SOURCES = $(sources) +included-modules: $(noinst_LTLIBRARIES) + +.PHONY: included-modules |