summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@unixuser.org>2013-06-10 11:22:39 +0900
committerDaiki Ueno <ueno@unixuser.org>2013-06-10 11:22:39 +0900
commit5f78b55ee930a671c8ef63435925dcef9cd0ab5c (patch)
treeddbac4f605942b508a848e57a88dee5c4ec82b95 /tools
parent2a34936437e5c3c3e5e7f3621cf92fa94eaa466a (diff)
downloadibus-5f78b55ee930a671c8ef63435925dcef9cd0ab5c.tar.gz
Suppress warnings with Automake 1.13
The make variable INCLUDES is now obsoleted by AM_CPPFLAGS. BUG= R=Shawn.P.Huang@gmail.com Review URL: https://codereview.appspot.com/9915054
Diffstat (limited to 'tools')
-rw-r--r--tools/Makefile.am8
1 files changed, 3 insertions, 5 deletions
diff --git a/tools/Makefile.am b/tools/Makefile.am
index bcb67db4..bd924413 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -24,19 +24,17 @@ NULL =
libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la
-INCLUDES = \
+# force include config.h before gi18n.h.
+AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_builddir)/src \
+ -include $(CONFIG_HEADER) \
$(NULL)
-# force include config.h before gi18n.h.
-AM_CPPFLAGS = -include $(CONFIG_HEADER)
-
AM_CFLAGS = \
@GLIB2_CFLAGS@ \
@GIO2_CFLAGS@ \
@GTHREAD2_CFLAGS@ \
- $(INCLUDES) \
-DG_LOG_DOMAIN=\"IBUS\" \
-DIBUS_DISABLE_DEPRECATED \
-Wno-unused-variable \