[metacity] Makefiles: Change INCLUDES to AM_CPPFLAGS
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] Makefiles: Change INCLUDES to AM_CPPFLAGS
- Date: Tue, 3 Jun 2014 17:22:14 +0000 (UTC)
commit 159f9aaf160283e0113af7f3bdc56433adb71c12
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Tue Jun 3 18:59:29 2014 +0300
Makefiles: Change INCLUDES to AM_CPPFLAGS
src/Makefile.am | 2 +-
src/tools/Makefile.am | 2 +-
src/wm-tester/Makefile.am | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index fc4e996..c650888 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libmetacity-private.la
SUBDIRS=wm-tester tools themes
-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@
+AM_CPPFLAGS=-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 \
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index bd0c103..5d76d57 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -3,7 +3,7 @@
icondir=$(pkgdatadir)/icons
icon_DATA=metacity-window-demo.png
-INCLUDES= METACITY_WINDOW_DEMO_CFLAGS@ @METACITY_MESSAGE_CFLAGS@ \
+AM_CPPFLAGS= METACITY_WINDOW_DEMO_CFLAGS@ @METACITY_MESSAGE_CFLAGS@ \
-DMETACITY_ICON_DIR=\"$(pkgdatadir)/icons\" \
-DMETACITY_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
diff --git a/src/wm-tester/Makefile.am b/src/wm-tester/Makefile.am
index e0c3048..b52b01b 100644
--- a/src/wm-tester/Makefile.am
+++ b/src/wm-tester/Makefile.am
@@ -1,5 +1,5 @@
-INCLUDES= METACITY_CFLAGS@
+AM_CPPFLAGS= METACITY_CFLAGS@
wm_tester_SOURCES= \
main.c
@@ -22,4 +22,4 @@ wm_tester_LDADD= @METACITY_LIBS@
test_gravity_LDADD= @METACITY_LIBS@
test_resizing_LDADD= @METACITY_LIBS@
test_size_hints_LDADD= @METACITY_LIBS@
-focus_window_LDADD= @METACITY_LIBS@
\ No newline at end of file
+focus_window_LDADD= @METACITY_LIBS@
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]