From 2aa486b81058f1c0a79530b04a80a28541dd7441 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Mon, 16 Jan 2006 10:44:54 +0000 Subject: Adjust the order of *_CFLAGS to the same order known to work. (Fixes bug 2006-01-16 Behdad Esfahbod * 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) --- ChangeLog | 6 ++++++ docs/Makefile.am | 2 +- examples/Makefile.am | 8 ++++---- pango/Makefile.am | 4 ++-- tests/Makefile.am | 8 ++++---- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8f1bc024..55dfbdb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-01-16 Behdad Esfahbod + + * 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 Fixes bug #314675, Brian Cameron. diff --git a/docs/Makefile.am b/docs/Makefile.am index 7bee28a1..6099e4b6 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -47,9 +47,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 5ab6b6ea..ba7e0a0b 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 9ff006e2..656cd44d 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -20,13 +20,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 -- cgit v1.2.1