1 files changed, 17 insertions, 5 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