From 157aa0af6d33e2554b341752608a55d9b9a6b121 Mon Sep 17 00:00:00 2001 From: Thomas James Alexander Thurman Date: Sun, 23 Nov 2008 20:29:18 +0000 Subject: [PATCH] reviewed by: Thomas Thurman * src/Makefile.am: reorder compiler flags so local includes come last. Closes #562033. svn path=/trunk/; revision=4029 --- ChangeLog | 9 ++++++++- src/Makefile.am | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc20182fc..dd6133fb0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,16 @@ +2008-11-23 Daniel Macks + + reviewed by: Thomas Thurman + + * src/Makefile.am: reorder compiler flags so local includes come last. + Closes #562033. + 2008-11-23 Daniel Macks reviewed by: Thomas Thurman * configure.in: only accept --enable-compositor if we find we can - actually composite. + actually composite. Closes #560990. 2008-11-23 Thomas Thurman diff --git a/src/Makefile.am b/src/Makefile.am index 3ce00f536..4c9e39cce 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,7 +2,7 @@ lib_LTLIBRARIES = libmetacity-private.la SUBDIRS=wm-tester tools themes -INCLUDES=@METACITY_CFLAGS@ -I $(srcdir)/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 +INCLUDES=-I$(srcdir)/include -DMETACITY_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMETACITY_PKGDATADIR=\"$(pkgdatadir)\" -DMETACITY_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"metacity\" -DSN_API_NOT_YET_FROZEN=1 @METACITY_CFLAGS@ metacity_SOURCES= \ core/async-getprop.c \