summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Mashal <[email protected]>2013-02-18 13:22:31 -0800
committerDan Mashal <[email protected]>2013-02-18 13:22:31 -0800
commit0865050e09b370b2d5b7a70b19746aa26e8357b0 (patch)
tree485c320458644e4ca22af8f7484ef7a4311be7c6
parent21511b93b268d3030e0e301f2a634228278f2932 (diff)
downloadmate-utils-0865050e09b370b2d5b7a70b19746aa26e8357b0.tar.bz2
mate-utils-0865050e09b370b2d5b7a70b19746aa26e8357b0.tar.xz
Update makefiles for automake 1.13
-rw-r--r--baobab/src/Makefile.am2
-rw-r--r--gsearchtool/libmateui-deprecated/Makefile.am2
-rw-r--r--libeggsmclient/Makefile.am2
-rw-r--r--logview/Makefile.am2
-rw-r--r--logview/tests/Makefile.am2
-rw-r--r--mate-dictionary/libgdict/Makefile.am2
-rw-r--r--mate-dictionary/src/Makefile.am2
-rw-r--r--mate-screenshot/Makefile.am2
8 files changed, 8 insertions, 8 deletions
diff --git a/baobab/src/Makefile.am b/baobab/src/Makefile.am
index 0361a9a2..8bd165c7 100644
--- a/baobab/src/Makefile.am
+++ b/baobab/src/Makefile.am
@@ -1,6 +1,6 @@
NULL =
-INCLUDES = \
+AM_CPPFLAGS = \
-DPREFIX=\""$(prefix)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DLIBDIR=\""$(libdir)"\" \
diff --git a/gsearchtool/libmateui-deprecated/Makefile.am b/gsearchtool/libmateui-deprecated/Makefile.am
index 024e4277..c3ed815d 100644
--- a/gsearchtool/libmateui-deprecated/Makefile.am
+++ b/gsearchtool/libmateui-deprecated/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-DGTK_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DG_DISABLE_DEPRECATED
diff --git a/libeggsmclient/Makefile.am b/libeggsmclient/Makefile.am
index 62cde707..4fb6ef52 100644
--- a/libeggsmclient/Makefile.am
+++ b/libeggsmclient/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -DGTK_DISABLE_DEPRECATED \
+AM_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \
-DG_DISABLE_DEPRECATED
diff --git a/logview/Makefile.am b/logview/Makefile.am
index ab9fa458..1fc2bd49 100644
--- a/logview/Makefile.am
+++ b/logview/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = data help tests
-INCLUDES = \
+AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"mate-system-log\" \
-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DDATADIR=\""$(datadir)"\" \
diff --git a/logview/tests/Makefile.am b/logview/tests/Makefile.am
index a06f4269..b7b668c3 100644
--- a/logview/tests/Makefile.am
+++ b/logview/tests/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(GIO_CFLAGS) \
-I../
diff --git a/mate-dictionary/libgdict/Makefile.am b/mate-dictionary/libgdict/Makefile.am
index 006b42f4..eaafbbcb 100644
--- a/mate-dictionary/libgdict/Makefile.am
+++ b/mate-dictionary/libgdict/Makefile.am
@@ -1,6 +1,6 @@
NULL =
-INCLUDES = -DG_LOG_DOMAIN=\"Gdict\" \
+AM_CPPFLAGS = -DG_LOG_DOMAIN=\"Gdict\" \
-DDATADIR=\""$(datadir)"\" \
-DLIBDIR=\""$(libdir)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
diff --git a/mate-dictionary/src/Makefile.am b/mate-dictionary/src/Makefile.am
index 1a674e0f..fd5b490f 100644
--- a/mate-dictionary/src/Makefile.am
+++ b/mate-dictionary/src/Makefile.am
@@ -1,6 +1,6 @@
NULL =
-INCLUDES = \
+AM_CPPFLAGS = \
-DPREFIX=\""$(prefix)"\" \
-DSYSCONFDIR=\""$(sysconfdir)"\" \
-DLIBDIR=\""$(libdir)"\" \
diff --git a/mate-screenshot/Makefile.am b/mate-screenshot/Makefile.am
index a6365213..842c5d04 100644
--- a/mate-screenshot/Makefile.am
+++ b/mate-screenshot/Makefile.am
@@ -1,6 +1,6 @@
NULL =
-INCLUDES = \
+AM_CPPFLAGS = \
-I. \
-I$(srcdir) \
-DMATELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \