diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-01-25 19:33:58 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-01-25 19:33:58 +0000 |
| commit | 1fdf2cb5e708c0a40379bf6f95cfc045289dfa96 (patch) | |
| tree | 4da6d1ffafc0fae529fc5e9c1587bc88dfa2e723 /modules | |
| parent | 8e3ee8fbef3cb3d62e0709d2eb76d9b04fc9bf70 (diff) | |
| download | pango-1fdf2cb5e708c0a40379bf6f95cfc045289dfa96.tar.gz | |
If major.minor of required and available glib versions are the same, add
2006-01-25 Behdad Esfahbod <behdad@gnome.org>
* configure.in: If major.minor of required and available glib versions
are the same, add -DG_DISABLE_DEPRECATED to GLIB_CFLAGS. (bug #328617)
* */Makefile.am: Remove hardcoded -DG_DISABLE_DEPRECATED.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/arabic/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/basic/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/hangul/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/hebrew/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/indic/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/khmer/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/syriac/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/thai/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/tibetan/Makefile.am | 12 |
9 files changed, 6 insertions, 14 deletions
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am index 78c488e1..ec632972 100644 --- a/modules/arabic/Makefile.am +++ b/modules/arabic/Makefile.am @@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREET INCLUDES = \ -DG_LOG_DOMAIN=\"Pango\" \ -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/pango \ diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am index 4a17c224..f3a35aed 100644 --- a/modules/basic/Makefile.am +++ b/modules/basic/Makefile.am @@ -11,7 +11,6 @@ pangoatsuilibs = $(top_builddir)/pango/libpangocairo-$(PANGO_API_VERSION).la $(p INCLUDES = \ -DG_LOG_DOMAIN=\"Pango\" \ -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/pango \ diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am index 9b57f036..bb0f2469 100644 --- a/modules/hangul/Makefile.am +++ b/modules/hangul/Makefile.am @@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREET INCLUDES = \ -DG_LOG_DOMAIN=\"Pango\" \ -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/pango \ diff --git a/modules/hebrew/Makefile.am b/modules/hebrew/Makefile.am index 3b03c8f6..f8450f83 100644 --- a/modules/hebrew/Makefile.am +++ b/modules/hebrew/Makefile.am @@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREET INCLUDES = \ -DG_LOG_DOMAIN=\"Pango\" \ -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/pango \ diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am index c604492d..ff073711 100644 --- a/modules/indic/Makefile.am +++ b/modules/indic/Makefile.am @@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREET INCLUDES = \ -DG_LOG_DOMAIN=\"Pango\" \ -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/pango \ diff --git a/modules/khmer/Makefile.am b/modules/khmer/Makefile.am index d79aa2a4..94b22f5f 100644 --- a/modules/khmer/Makefile.am +++ b/modules/khmer/Makefile.am @@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREET INCLUDES = \ -DG_LOG_DOMAIN=\"Pango\" \ -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/pango \ diff --git a/modules/syriac/Makefile.am b/modules/syriac/Makefile.am index 302df7d3..6722f00e 100644 --- a/modules/syriac/Makefile.am +++ b/modules/syriac/Makefile.am @@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREET INCLUDES = \ -DG_LOG_DOMAIN=\"Pango\" \ -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/pango \ diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am index 05a26ad0..252240a5 100644 --- a/modules/thai/Makefile.am +++ b/modules/thai/Makefile.am @@ -6,7 +6,6 @@ pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREET INCLUDES = \ -DG_LOG_DOMAIN=\"Pango\" \ -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/pango \ diff --git a/modules/tibetan/Makefile.am b/modules/tibetan/Makefile.am index 6cb71164..2dab807f 100644 --- a/modules/tibetan/Makefile.am +++ b/modules/tibetan/Makefile.am @@ -3,12 +3,12 @@ pangolibs = $(top_builddir)/pango/libpango-$(PANGO_API_VERSION).la $(GLIB_LIBS) pangoft2libs = $(top_builddir)/pango/libpangoft2-$(PANGO_API_VERSION).la $(FREETYPE_LIBS) $(pangolibs) -INCLUDES = \ - -DPANGO_ENABLE_ENGINE \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango \ +INCLUDES = \ + -DG_LOG_DOMAIN=\"Pango\" \ + -DPANGO_ENABLE_ENGINE \ + $(PANGO_DEBUG_FLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/pango \ $(GLIB_CFLAGS) moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules |