1 files changed, 4 insertions, 33 deletions
diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am
index 9825fdef..2f2f3bce 100644
--- a/modules/tamil/Makefile.am
+++ b/modules/tamil/Makefile.am
@@ -2,34 +2,12 @@
 
 pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(FRIBIDI_LIBS) $(GLIB_LIBS)
 pangoxlibs = $(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la $(X_LIBS) $(pangolibs)
-pangoxftlibs = $(top_builddir)/pango/libpangoxft-$(PANGO_API_VERSION).la $(XFT_LIBS) $(pangolibs)
 pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs)
 
-if HAVE_XFT
-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=
-XFT_INCLUDED=
-XFT_PREFIX=
-endif
-
 x_sources = \
 	tamil-x.c \
 	tadefs.h
 
-xft_sources = \
-	tamil-xft.c \
-	tadefs.h
-
 if HAVE_X
 if INCLUDE_TAMIL_X
 X_MODULES=
@@ -47,13 +25,12 @@ X_INCLUDED=
 X_PREFIX=
 endif
 
-noinst_LTLIBRARIES = $(X_INCLUDED) $(XFT_INCLUDED)
-module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES)
-EXTRA_LTLIBRARIES = libpango-tamil-xft.la pango-tamil-xft.la
-moddefine = $(X_PREFIX) $(XFT_PREFIX)
+noinst_LTLIBRARIES = $(X_INCLUDED)
+module_LTLIBRARIES = $(X_MODULES)
+moddefine = $(X_PREFIX)
 moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
 
-INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS)
+INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(FREETYPE_CFLAGS) $(X_CFLAGS) 
 
 pango_tamil_x_la_LDFLAGS = -export-dynamic -avoid-version -module
 pango_tamil_x_la_LIBADD = $(tamil_x_libadd)
@@ -61,12 +38,6 @@ pango_tamil_x_la_SOURCES = $(x_sources)
 
 libpango_tamil_x_la_SOURCES = $(x_sources)
 
-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