diff options
author | Behdad Esfahbod <behdad@gnome.org> | 2006-01-16 10:10:23 +0000 |
---|---|---|
committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-01-16 10:10:23 +0000 |
commit | 6cc141fdd95ba7b2623f176e7a4321524d600641 (patch) | |
tree | b8acaef91f4886ca12bc8fffbf12f9a600fa878e /modules | |
parent | 240877fc00047a2898f8f8d338684c2e4e087b90 (diff) | |
download | pango-6cc141fdd95ba7b2623f176e7a4321524d600641.tar.gz |
Fixes bug #71414, allowing to disable building/installing modules.
2006-01-16 Behdad Esfahbod <behdad@gnome.org>
Fixes bug #71414, allowing to disable building/installing modules.
* configure.in: Add support for --with-dynamic-modules.
* */Makefile.am: Adapt to the above change.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/Makefile.am | 7 | ||||
-rw-r--r-- | modules/arabic/Makefile.am | 5 | ||||
-rw-r--r-- | modules/basic/Makefile.am | 11 | ||||
-rw-r--r-- | modules/hangul/Makefile.am | 5 | ||||
-rw-r--r-- | modules/hebrew/Makefile.am | 5 | ||||
-rw-r--r-- | modules/indic/Makefile.am | 5 | ||||
-rw-r--r-- | modules/khmer/Makefile.am | 5 | ||||
-rw-r--r-- | modules/syriac/Makefile.am | 5 | ||||
-rw-r--r-- | modules/thai/Makefile.am | 5 | ||||
-rw-r--r-- | modules/tibetan/Makefile.am | 5 |
10 files changed, 48 insertions, 10 deletions
diff --git a/modules/Makefile.am b/modules/Makefile.am index 39cc6ff7..73b2cf43 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -42,5 +42,10 @@ included-modules: ( cd $$d && $(MAKE) $(AM_MAKEFLAGS) included-modules ) ; \ done -.PHONY: included-modules +dynamic-modules: + @for d in $(SUBDIRS) ; do \ + ( cd $$d && $(MAKE) $(AM_MAKEFLAGS) dynamic-modules ) ; \ + done + +.PHONY: included-modules dynamic-modules diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am index d3e459e8..78c488e1 100644 --- a/modules/arabic/Makefile.am +++ b/modules/arabic/Makefile.am @@ -22,9 +22,11 @@ INCLUDES += $(FREETYPE_CFLAGS) if INCLUDE_ARABIC_FC noinst_LTLIBRARIES += libpango-arabic-fc.la else +if DYNAMIC_ARABIC_FC module_LTLIBRARIES += pango-arabic-fc.la endif endif +endif fc_sources = \ arabic-fc.c \ @@ -39,5 +41,6 @@ libpango_arabic_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_arabic_fc included-modules: $(noinst_LTLIBRARIES) +dynamic-modules: $(module_LTLIBRARIES) -.PHONY: included-modules +.PHONY: included-modules dynamic-modules diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am index 086a1cf9..4a17c224 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -26,9 +26,11 @@ INCLUDES += $(X_CFLAGS) if INCLUDE_BASIC_X noinst_LTLIBRARIES += libpango-basic-x.la else +if DYNAMIC_BASIC_X module_LTLIBRARIES += pango-basic-x.la endif endif +endif pango_basic_x_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS) pango_basic_x_la_LIBADD = $(pangoxlibs) @@ -42,9 +44,11 @@ INCLUDES += $(FREETYPE_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) @@ -57,9 +61,11 @@ 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 @@ -80,9 +86,11 @@ INCLUDES += $(ATSUI_CFLAGS) $(CAIRO_CFLAGS) if INCLUDE_BASIC_ATSUI noinst_LTLIBRARIES += libpango-basic-atsui.la else +if DYNAMIC_BASIC_ATSUI module_LTLIBRARIES += pango-basic-atsui.la endif endif +endif pango_basic_atsui_la_LDFLAGS = -module $(MODULE_LIBTOOL_OPTIONS) -framework Carbon pango_basic_atsui_la_LIBADD = $(pangoatsuilibs) @@ -96,5 +104,6 @@ EXTRA_DIST = \ tables-small.i included-modules: $(noinst_LTLIBRARIES) +dynamic-modules: $(module_LTLIBRARIES) -.PHONY: included-modules +.PHONY: included-modules dynamic-modules diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am index 451e8367..9b57f036 100644 --- a/modules/hangul/Makefile.am +++ b/modules/hangul/Makefile.am @@ -22,9 +22,11 @@ INCLUDES += $(FREETYPE_CFLAGS) if INCLUDE_HANGUL_FC noinst_LTLIBRARIES += libpango-hangul-fc.la else +if DYNAMIC_HANGUL_FC module_LTLIBRARIES += pango-hangul-fc.la endif endif +endif fc_sources = hangul-fc.c hangul-defs.h @@ -39,5 +41,6 @@ EXTRA_DIST = \ tables-jamos.i included-modules: $(noinst_LTLIBRARIES) +dynamic-modules: $(module_LTLIBRARIES) -.PHONY: included-modules +.PHONY: included-modules dynamic-modules diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am index b084924a..3b03c8f6 100644 --- a/modules/hebrew/Makefile.am +++ b/modules/hebrew/Makefile.am @@ -24,9 +24,11 @@ INCLUDES += $(FREETYPE_CFLAGS) if INCLUDE_HEBREW_FC noinst_LTLIBRARIES += libpango-hebrew-fc.la else +if DYNAMIC_HEBREW_FC module_LTLIBRARIES += pango-hebrew-fc.la endif endif +endif hebrew_fc_sources = $(common_sources) hebrew-fc.c @@ -38,5 +40,6 @@ libpango_hebrew_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_hebrew_fc included-modules: $(noinst_LTLIBRARIES) +dynamic-modules: $(module_LTLIBRARIES) -.PHONY: included-modules +.PHONY: included-modules dynamic-modules diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am index 06ee65de..c604492d 100644 --- a/modules/indic/Makefile.am +++ b/modules/indic/Makefile.am @@ -22,9 +22,11 @@ INCLUDES += $(FREETYPE_CFLAGS) if INCLUDE_INDIC_FC noinst_LTLIBRARIES += libpango-indic-fc.la else +if DYNAMIC_INDIC_FC module_LTLIBRARIES += pango-indic-fc.la endif endif +endif fc_sources = \ indic-fc.c \ @@ -42,6 +44,7 @@ libpango_indic_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_indic_fc included-modules: $(noinst_LTLIBRARIES) +dynamic-modules: $(module_LTLIBRARIES) -.PHONY: included-modules +.PHONY: included-modules dynamic-modules diff --git a/modules/khmer/Makefile.am b/modules/khmer/Makefile.am index 47a12f7b..d79aa2a4 100644 --- a/modules/khmer/Makefile.am +++ b/modules/khmer/Makefile.am @@ -22,9 +22,11 @@ INCLUDES += $(FREETYPE_CFLAGS) if INCLUDE_KHMER_FC noinst_LTLIBRARIES += libpango-khmer-fc.la else +if DYNAMIC_KHMER_FC module_LTLIBRARIES += pango-khmer-fc.la endif endif +endif fc_sources = \ khmer-fc.c @@ -37,5 +39,6 @@ libpango_khmer_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_khmer_fc included-modules: $(noinst_LTLIBRARIES) +dynamic-modules: $(module_LTLIBRARIES) -.PHONY: included-modules +.PHONY: included-modules dynamic-modules diff --git a/modules/syriac/Makefile.am b/modules/syriac/Makefile.am index 4b8a3853..302df7d3 100644 --- a/modules/syriac/Makefile.am +++ b/modules/syriac/Makefile.am @@ -21,9 +21,11 @@ INCLUDES += $(FREETYPE_CFLAGS) if INCLUDE_SYRIAC_FC noinst_LTLIBRARIES += libpango-syriac-fc.la else +if DYNAMIC_SYRIAC_FC module_LTLIBRARIES += pango-syriac-fc.la endif endif +endif fc_sources = \ syriac-fc.c \ @@ -38,5 +40,6 @@ libpango_syriac_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_syriac_fc included-modules: $(noinst_LTLIBRARIES) +dynamic-modules: $(module_LTLIBRARIES) -.PHONY: included-modules +.PHONY: included-modules dynamic-modules diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am index dbaf3d30..05a26ad0 100644 --- a/modules/thai/Makefile.am +++ b/modules/thai/Makefile.am @@ -24,9 +24,11 @@ INCLUDES += $(FREETYPE_CFLAGS) if INCLUDE_THAI_FC noinst_LTLIBRARIES += libpango-thai-fc.la else +if DYNAMIC_THAI_FC module_LTLIBRARIES += pango-thai-fc.la endif endif +endif thai_fc_sources = $(common_sources) thai-fc.c thai-ot.c thai-ot.h @@ -38,5 +40,6 @@ libpango_thai_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_thai_fc included-modules: $(noinst_LTLIBRARIES) +dynamic-modules: $(module_LTLIBRARIES) -.PHONY: included-modules +.PHONY: included-modules dynamic-modules diff --git a/modules/tibetan/Makefile.am b/modules/tibetan/Makefile.am index d8c822e0..6cb71164 100644 --- a/modules/tibetan/Makefile.am +++ b/modules/tibetan/Makefile.am @@ -20,9 +20,11 @@ INCLUDES += $(FREETYPE_CFLAGS) if INCLUDE_TIBETAN_FC noinst_LTLIBRARIES += libpango-tibetan-fc.la else +if DYNAMIC_TIBETAN_FC module_LTLIBRARIES += pango-tibetan-fc.la endif endif +endif tibetan_fc_sources = $(common_sources) tibetan-fc.c @@ -34,5 +36,6 @@ libpango_tibetan_fc_la_CFLAGS = -DPANGO_MODULE_PREFIX=_pango_tibetan_fc included-modules: $(noinst_LTLIBRARIES) +dynamic-modules: $(module_LTLIBRARIES) -.PHONY: included-modules +.PHONY: included-modules dynamic-modules |