diff options
| author | Sebastian Wilhelmi <wilhelmi@src.gnome.org> | 2001-12-13 17:44:46 +0000 |
|---|---|---|
| committer | Sebastian Wilhelmi <wilhelmi@src.gnome.org> | 2001-12-13 17:44:46 +0000 |
| commit | 384eaf43f11dcee0d7b10af5663bb5f8822634cf (patch) | |
| tree | 5dd41435eaccd8c6ef00faaeebe29a63771979e8 | |
| parent | f266802671eb55513ecd0941dbb7a88a144a2da8 (diff) | |
| download | pango-384eaf43f11dcee0d7b10af5663bb5f8822634cf.tar.gz | |
Resuming aborted commit
Resuming aborted commit
| -rw-r--r-- | modules/tamil/Makefile.am | 2 | ||||
| -rw-r--r-- | modules/thai/Makefile.am | 2 | ||||
| -rw-r--r-- | pango/Makefile.am | 1 | ||||
| -rw-r--r-- | pango/mini-fribidi/Makefile.am | 1 | ||||
| -rw-r--r-- | pango/opentype/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/Makefile.am | 3 |
6 files changed, 7 insertions, 3 deletions
diff --git a/modules/tamil/Makefile.am b/modules/tamil/Makefile.am index def87435..eb6c6a3a 100644 --- a/modules/tamil/Makefile.am +++ b/modules/tamil/Makefile.am @@ -52,7 +52,7 @@ module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES) moddefine = $(X_PREFIX) $(XFT_PREFIX) moduledir = $(libdir)/pango/modules -INCLUDES = -DPANGO_ENABLE_ENGINE -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) $(X_CFLAGS) $(FREETYPE_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 7fc5efee..f32ffb51 100644 --- a/modules/thai/Makefile.am +++ b/modules/thai/Makefile.am @@ -18,7 +18,7 @@ thai_x_libadd=$(pangoxlibs) endif endif -INCLUDES = -DPANGO_ENABLE_ENGINE -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) +INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) pango_thai_x_la_LDFLAGS = -export-dynamic -avoid-version -module pango_thai_x_la_LIBADD = $(thai_x_libadd) diff --git a/pango/Makefile.am b/pango/Makefile.am index 06c3144f..1a9a9754 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -25,6 +25,7 @@ INCLUDES = \ -DPANGO_ENABLE_ENGINE \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBDIR=\"$(libdir)\" \ + -DG_DISABLE_DEPRECATED \ $(X_CFLAGS) \ $(FREETYPE_CFLAGS) \ -I$(top_srcdir) diff --git a/pango/mini-fribidi/Makefile.am b/pango/mini-fribidi/Makefile.am index 53263f14..74c78800 100644 --- a/pango/mini-fribidi/Makefile.am +++ b/pango/mini-fribidi/Makefile.am @@ -3,6 +3,7 @@ INCLUDES = \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBDIR=\"$(libdir)\" \ + -DG_DISABLE_DEPRECATED \ -I$(top_srcdir) LDADDS = @STRIP_BEGIN@ \ diff --git a/pango/opentype/Makefile.am b/pango/opentype/Makefile.am index 2081396a..e8c016f4 100644 --- a/pango/opentype/Makefile.am +++ b/pango/opentype/Makefile.am @@ -4,6 +4,7 @@ INCLUDES = \ -DPANGO_ENABLE_ENGINE \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -DLIBDIR=\"$(libdir)\" \ + -DG_DISABLE_DEPRECATED \ $(FREETYPE_CFLAGS) \ $(X_CFLAGS) \ -I$(top_srcdir) diff --git a/tests/Makefile.am b/tests/Makefile.am index aabc7afc..3be5b83b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -32,7 +32,8 @@ INCLUDES = \ $(X_DEFINES) \ $(XFT_DEFINES) \ $(FT2_DEFINES) \ - $(WIN32_DEFINES) + $(WIN32_DEFINES) \ + -DG_DISABLE_DEPRECATED TESTS=runtests.sh |