diff options
| author | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-11-23 20:29:18 +0000 |
|---|---|---|
| committer | Thomas James Alexander Thurman <tthurman@src.gnome.org> | 2008-11-23 20:29:18 +0000 |
| commit | 157aa0af6d33e2554b341752608a55d9b9a6b121 (patch) | |
| tree | 1e6fea03da30ab1bddf1aaf788110a2550c10276 | |
| parent | 88cd9788372947171c38330bbcd09466eb0b1336 (diff) | |
| download | metacity-157aa0af6d33e2554b341752608a55d9b9a6b121.tar.gz | |
reviewed by: Thomas Thurman
* src/Makefile.am: reorder compiler flags so local includes come last.
Closes #562033.
svn path=/trunk/; revision=4029
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 9 insertions, 2 deletions
@@ -2,8 +2,15 @@ reviewed by: Thomas Thurman + * src/Makefile.am: reorder compiler flags so local includes come last. + Closes #562033. + +2008-11-23 Daniel Macks <dmacks@netspace.org> + + 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 <tthurman@gnome.org> diff --git a/src/Makefile.am b/src/Makefile.am index 3ce00f53..4c9e39cc 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 \ |