From 5f78b55ee930a671c8ef63435925dcef9cd0ab5c Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 10 Jun 2013 11:22:39 +0900 Subject: 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 --- tools/Makefile.am | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'tools') 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 \ -- cgit v1.2.1