[modules] Don't build any dynamic modules

6 files changed, 5 insertions, 82 deletions

diff --git a/modules/Makefile.am b/modules/Makefile.am
index 73b42f4d..5aa4136a 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -61,11 +61,6 @@ included-modules:
 		( cd $$d && $(MAKE) $(AM_MAKEFLAGS) included-modules ) ; \
         done
 
-dynamic-modules:
-	@for d in $(SUBDIRS) ; do \
-		( cd $$d && $(MAKE) $(AM_MAKEFLAGS) dynamic-modules ) ; \
-        done
-
-.PHONY: included-modules dynamic-modules
+.PHONY: included-modules
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/Module.mk b/modules/Module.mk
index aa504700..8c0397c2 100644
--- a/modules/Module.mk
+++ b/modules/Module.mk
@@ -1,21 +1,3 @@
-pangolibs =								\
-	$(GLIB_LIBS)							\
-	$(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la
-pangoxlibs =								\
-	$(pangolibs)							\
-	$(top_builddir)/pango/libpangox-$(PANGO_API_VERSION).la		\
-	$(X_LIBS)
-pangoft2libs =								\
-	$(pangolibs)							\
-	$(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la	\
-	$(FREETYPE_LIBS)
-pangowin32libs =							\
-	$(pangolibs)							\
-	$(top_builddir)/pango/libpangowin32-$(PANGO_API_VERSION).la
-pangoatsuilibs =							\
-	$(pangolibs)							\
-	$(top_builddir)/pango/libpangocairo-$(PANGO_API_VERSION).la
-
 INCLUDES = 				\
 	-DG_LOG_DOMAIN=\"Pango\"	\
 	-DPANGO_ENABLE_ENGINE		\
@@ -24,12 +6,9 @@ INCLUDES = 				\
 	-I$(top_srcdir)/pango		\
 	$(GLIB_CFLAGS)
 
-moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
-module_LTLIBRARIES =
 noinst_LTLIBRARIES =
 
 
 included-modules: $(noinst_LTLIBRARIES)
-dynamic-modules: $(module_LTLIBRARIES)
 
-.PHONY: included-modules dynamic-modules
+.PHONY: included-modules
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index 2a20532b..b43bb367 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -3,19 +3,9 @@ include $(top_srcdir)/modules/Module.mk
 
 if INCLUDE_ARABIC_LANG
 noinst_LTLIBRARIES += libpango-arabic-lang.la
-else
-if DYNAMIC_ARABIC_LANG
-module_LTLIBRARIES += pango-arabic-lang.la
 endif
-endif
-
-lang_sources = \
-	arabic-lang.c
 
-pango_arabic_lang_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
-pango_arabic_lang_la_LIBADD = $(pangolibs)
-pango_arabic_lang_la_SOURCES = $(lang_sources)
-libpango_arabic_lang_la_SOURCES = $(lang_sources)
+libpango_arabic_lang_la_SOURCES = arabic-lang.c
 libpango_arabic_lang_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_arabic_lang
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 9726870b..b66ae771 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -4,16 +4,9 @@ if HAVE_FREETYPE
 INCLUDES += $(FREETYPE_CFLAGS) $(HARFBUZZ_CFLAGS)
 if INCLUDE_BASIC_FC
 noinst_LTLIBRARIES += libpango-basic-fc.la
-else
-if DYNAMIC_BASIC_FC
-module_LTLIBRARIES += pango-basic-fc.la
-endif
 endif
 endif
 
-pango_basic_fc_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
-pango_basic_fc_la_LIBADD = $(pangoft2libs) $(HARFBUZZ_LIBS)
-pango_basic_fc_la_SOURCES = basic-fc.c
 libpango_basic_fc_la_SOURCES = basic-fc.c
 libpango_basic_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_fc
 
@@ -21,17 +14,10 @@ libpango_basic_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_fc
 if HAVE_WIN32
 if INCLUDE_BASIC_WIN32
 noinst_LTLIBRARIES += libpango-basic-win32.la
-else
-if DYNAMIC_BASIC_WIN32
-module_LTLIBRARIES += pango-basic-win32.la
-endif
 endif
 endif
 
-pango_basic_win32_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
-pango_basic_win32_la_LIBADD = $(pangowin32libs) -lgdi32 -lusp10
 libpango_basic_win32_la_LIBADD = -lgdi32 -lusp10
-pango_basic_win32_la_SOURCES = basic-win32.c
 libpango_basic_win32_la_SOURCES = basic-win32.c
 libpango_basic_win32_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_win32
 
@@ -39,16 +25,9 @@ if HAVE_CORE_TEXT
 INCLUDES += $(CAIRO_CFLAGS)
 if INCLUDE_BASIC_CORE_TEXT
 noinst_LTLIBRARIES += libpango-basic-coretext.la
-else
-if DYNAMIC_BASIC_CORE_TEXT
-module_LTLIBRARIES += pango-basic-coretext.la
-endif
 endif
 endif
 
-pango_basic_coretext_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS) -framework Carbon
-pango_basic_coretext_la_LIBADD = $(pangocoretextlibs)
-pango_basic_coretext_la_SOURCES = basic-coretext.c
 libpango_basic_coretext_la_SOURCES = basic-coretext.c
 libpango_basic_coretext_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_basic_coretext
 
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index 599a2eb5..f6f40484 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -2,19 +2,9 @@ include $(top_srcdir)/modules/Module.mk
 
 if INCLUDE_INDIC_LANG
 noinst_LTLIBRARIES += libpango-indic-lang.la
-else
-if DYNAMIC_INDIC_LANG
-module_LTLIBRARIES += pango-indic-lang.la
 endif
-endif
-
-lang_sources =		\
-	indic-lang.c
 
-pango_indic_lang_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
-pango_indic_lang_la_LIBADD = $(pangolibs)
-pango_indic_lang_la_SOURCES = $(lang_sources)
-libpango_indic_lang_la_SOURCES = $(lang_sources)
+libpango_indic_lang_la_SOURCES = indic-lang.c
 libpango_indic_lang_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_indic_lang
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index ba9fa842..79ba7213 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -2,19 +2,9 @@ include $(top_srcdir)/modules/Module.mk
 
 if INCLUDE_THAI_LANG
 noinst_LTLIBRARIES += libpango-thai-lang.la
-else
-if DYNAMIC_THAI_LANG
-module_LTLIBRARIES += pango-thai-lang.la
 endif
-endif
-
-lang_sources = \
-	thai-lang.c
 
-pango_thai_lang_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS)
-pango_thai_lang_la_LIBADD = $(pangolibs) $(LIBTHAI_LIBS)
-pango_thai_lang_la_SOURCES = $(lang_sources)
-libpango_thai_lang_la_SOURCES = $(lang_sources)
+libpango_thai_lang_la_SOURCES = thai-lang.c
 libpango_thai_lang_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_thai_lang $(LIBTHAI_CFLAGS)
 libpango_thai_lang_la_LIBADD = $(LIBTHAI_LIBS)