diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2006-01-16 10:43:44 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-01-16 10:43:44 +0000 |
| commit | da2bc9c820198b620bfcdcffc6629c5fa9f1d1db (patch) | |
| tree | 8675a42b5168698eebed39cc65aaca064effd802 | |
| parent | 08247583a00f69914682ba1807e4e377b6a98e48 (diff) | |
| download | pango-da2bc9c820198b620bfcdcffc6629c5fa9f1d1db.tar.gz | |
Adjust the order of *_CFLAGS to the same order known to work. (Fixes bug
2006-01-16 Behdad Esfahbod <behdad@gnome.org>
* docs/Makefile.am, examples/Makefile.am, pango/Makefile.am,
tests/Makefile.am: Adjust the order of *_CFLAGS to the same order
known to work. (Fixes bug #325588)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | docs/Makefile.am | 2 | ||||
| -rw-r--r-- | examples/Makefile.am | 8 | ||||
| -rw-r--r-- | pango/Makefile.am | 4 | ||||
| -rw-r--r-- | tests/Makefile.am | 8 |
5 files changed, 17 insertions, 11 deletions
@@ -1,5 +1,11 @@ 2006-01-16 Behdad Esfahbod <behdad@gnome.org> + * docs/Makefile.am, examples/Makefile.am, pango/Makefile.am, + tests/Makefile.am: Adjust the order of *_CFLAGS to the same order + known to work. (Fixes bug #325588) + +2006-01-16 Behdad Esfahbod <behdad@gnome.org> + Fixes bug #314675, Brian Cameron. * configure.in: Handle uninstalled cairo. diff --git a/docs/Makefile.am b/docs/Makefile.am index 5c9b288d..63787553 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -49,9 +49,9 @@ INCLUDES = \ -DPANGO_ENABLE_BACKEND \ -DPANGO_ENABLE_ENGINE \ -I$(top_srcdir) \ - $(CAIRO_CFLAGS) \ $(GLIB_CFLAGS) \ $(XFT_CFLAGS) \ + $(CAIRO_CFLAGS) \ $(FREETYPE_CFLAGS) \ $(X_CFLAGS) diff --git a/examples/Makefile.am b/examples/Makefile.am index 7ab1fe50..f41174f0 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -5,13 +5,13 @@ aliasdir = $(sysconfdir)/pango INCLUDES = \ -DG_DISABLE_DEPRECATED \ -DPANGO_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) \ -I$(top_srcdir) \ - $(CAIRO_CFLAGS) \ + $(PANGO_DEBUG_FLAGS) \ $(GLIB_CFLAGS) \ - $(X_CFLAGS) \ $(XFT_CFLAGS) \ - $(FREETYPE_CFLAGS) + $(CAIRO_CFLAGS) \ + $(FREETYPE_CFLAGS) \ + $(X_CFLAGS) ################################################### diff --git a/pango/Makefile.am b/pango/Makefile.am index caf43a3e..3fdf7490 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -22,13 +22,13 @@ INCLUDES = \ -DLIBDIR=\"$(libdir)\" \ -DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \ -DG_DISABLE_DEPRECATED \ + -I$(top_srcdir) \ $(PANGO_DEBUG_FLAGS) \ $(GLIB_CFLAGS) \ $(XFT_CFLAGS) \ $(CAIRO_CFLAGS) \ $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) \ - -I$(top_srcdir) + $(X_CFLAGS) BUILT_SOURCES = pango-enum-types.h pango-enum-types.c diff --git a/tests/Makefile.am b/tests/Makefile.am index 58175d28..e407b57f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,14 +1,14 @@ ## Process this file with automake to create Makefile.in. INCLUDES = \ + -DG_DISABLE_DEPRECATED \ -I$(top_srcdir) \ + $(PANGO_DEBUG_FLAGS) \ $(GLIB_CFLAGS) \ - $(CAIRO_CFLAGS) \ $(XFT_CFLAGS) \ + $(CAIRO_CFLAGS) \ $(FREETYPE_CFLAGS) \ - $(X_CFLAGS) \ - -DG_DISABLE_DEPRECATED \ - $(PANGO_DEBUG_FLAGS) + $(X_CFLAGS) if HAVE_XFT INCLUDES += -DHAVE_X |