diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/arabic/Makefile.am | 11 | ||||
| -rw-r--r-- | modules/basic/Makefile.am | 9 | ||||
| -rw-r--r-- | modules/hangul/Makefile.am | 11 | ||||
| -rw-r--r-- | modules/hebrew/Makefile.am | 9 | ||||
| -rw-r--r-- | modules/indic/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/tamil/Makefile.am | 10 | ||||
| -rw-r--r-- | modules/thai/Makefile.am | 11 |
7 files changed, 50 insertions, 12 deletions
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am index 4c8ccfe4..f080ef38 100644 --- a/modules/arabic/Makefile.am +++ b/modules/arabic/Makefile.am @@ -86,7 +86,16 @@ module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) $(FT2_MODULES) moddefine = $(X_PREFIX) $(XFT_PREFIX) $(FT2_PREFIX) moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(XFT_CFLAGS) $(FREETYPE_CFLAGS) $(X_CFLAGS) +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(moddefine) \ + $(GLIB_CFLAGS) \ + $(XFT_CFLAGS) \ + $(FREETYPE_CFLAGS) \ + $(X_CFLAGS) pango_arabic_x_la_LDFLAGS = -export-dynamic -avoid-version -module pango_arabic_x_la_LIBADD = $(arabic_x_libadd) diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am index 7e41eab3..82928498 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -88,11 +88,12 @@ moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules INCLUDES = \ -DPANGO_ENABLE_ENGINE \ -DG_DISABLE_DEPRECATED \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ - $(XFT_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) \ + $(XFT_CFLAGS) \ $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) \ + $(X_CFLAGS) \ $(moddefine) pango_basic_x_la_LDFLAGS = -export-dynamic -avoid-version -module diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am index cf8fd657..1ca234c7 100644 --- a/modules/hangul/Makefile.am +++ b/modules/hangul/Makefile.am @@ -47,7 +47,16 @@ module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) moddefine = $(X_PREFIX) $(XFT_PREFIX) moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(XFT_CFLAGS) $(FREETYPE_CFLAGS) $(X_CFLAGS) +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(moddefine) \ + $(GLIB_CFLAGS) \ + $(XFT_CFLAGS) \ + $(FREETYPE_CFLAGS) \ + $(X_CFLAGS) pango_hangul_x_la_LDFLAGS = -export-dynamic -avoid-version -module pango_hangul_x_la_SOURCES = $(x_sources) diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am index 5a02c277..b50c3afd 100644 --- a/modules/hebrew/Makefile.am +++ b/modules/hebrew/Makefile.am @@ -70,14 +70,15 @@ module_LTLIBRARIES = $(X_MODULES) $(FT2_MODULES) $(XFT_MODULES) moddefine = $(X_PREFIX) $(FT2_PREFIX) $(XFT_PREFIX) moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -INCLUDES = \ +INCLUDES = \ -DPANGO_ENABLE_ENGINE \ -DG_DISABLE_DEPRECATED \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango/ \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) \ $(XFT_CFLAGS) \ $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) \ + $(X_CFLAGS) \ $(moddefine) pango_hebrew_x_la_LDFLAGS = -export-dynamic -avoid-version -module diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am index 89f29a3c..5f3ea069 100644 --- a/modules/indic/Makefile.am +++ b/modules/indic/Makefile.am @@ -90,6 +90,7 @@ INCLUDES = \ -DG_DISABLE_DEPRECATED \ -I$(top_srcdir) \ -I$(top_srcdir)/pango/ \ + $(GLIB_CFLAGS) \ $(XFT_CFLAGS) \ $(X_CFLAGS) \ $(myanmar_x_cflags) \ diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am index 2f2f3bce..87879858 100644 --- a/modules/tamil/Makefile.am +++ b/modules/tamil/Makefile.am @@ -30,7 +30,15 @@ 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) $(FREETYPE_CFLAGS) $(X_CFLAGS) +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(moddefine) \ + $(GLIB_CFLAGS) \ + $(FREETYPE_CFLAGS) \ + $(X_CFLAGS) pango_tamil_x_la_LDFLAGS = -export-dynamic -avoid-version -module pango_tamil_x_la_LIBADD = $(tamil_x_libadd) diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am index 9a80ccad..84d49a65 100644 --- a/modules/thai/Makefile.am +++ b/modules/thai/Makefile.am @@ -48,7 +48,16 @@ module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) moddefine = $(X_PREFIX) $(XFT_PREFIX) moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules -INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(XFT_CFLAGS) $(FREETYPE_CFLAGS) $(X_CFLAGS) +INCLUDES = \ + -DPANGO_ENABLE_ENGINE \ + -DG_DISABLE_DEPRECATED \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango/ \ + $(moddefine) \ + $(GLIB_CFLAGS) \ + $(XFT_CFLAGS) \ + $(FREETYPE_CFLAGS) \ + $(X_CFLAGS) pango_thai_x_la_LDFLAGS = -export-dynamic -avoid-version -module pango_thai_x_la_LIBADD = $(thai_x_libadd) |