From 5f78b55ee930a671c8ef63435925dcef9cd0ab5c Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 10 Jun 2013 11:22:39 +0900 Subject: [PATCH] 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 --- bus/Makefile.am | 3 +-- client/gtk2/Makefile.am | 2 +- client/gtk3/Makefile.am | 2 +- engine/Makefile.am | 3 +-- src/tests/Makefile.am | 2 +- tools/Makefile.am | 8 +++----- ui/gtk3/Makefile.am | 8 +++----- 7 files changed, 11 insertions(+), 17 deletions(-) diff --git a/bus/Makefile.am b/bus/Makefile.am index 7d60d15..826c673 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am @@ -24,7 +24,7 @@ NULL = libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ $(NULL) @@ -38,7 +38,6 @@ AM_CFLAGS = \ -DLIBEXECDIR=\"$(libexecdir)\" \ -DBINDIR=\"@bindir@\" \ -DIBUS_DISABLE_DEPRECATED \ - $(INCLUDES) \ $(NULL) AM_LDADD = \ @GOBJECT2_LIBS@ \ diff --git a/client/gtk2/Makefile.am b/client/gtk2/Makefile.am index 471a11c..e7c2883 100644 --- a/client/gtk2/Makefile.am +++ b/client/gtk2/Makefile.am @@ -22,7 +22,7 @@ libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ $(NULL) diff --git a/client/gtk3/Makefile.am b/client/gtk3/Makefile.am index 4505622..e654980 100644 --- a/client/gtk3/Makefile.am +++ b/client/gtk3/Makefile.am @@ -22,7 +22,7 @@ libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ $(NULL) diff --git a/engine/Makefile.am b/engine/Makefile.am index 3571edd..73f82f8 100644 --- a/engine/Makefile.am +++ b/engine/Makefile.am @@ -22,7 +22,7 @@ libibus = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ $(NULL) @@ -31,7 +31,6 @@ AM_CFLAGS = \ @GLIB2_CFLAGS@ \ @GIO2_CFLAGS@ \ @GTHREAD2_CFLAGS@ \ - $(INCLUDES) \ -DG_LOG_DOMAIN=\"IBUS\" \ -DPKGDATADIR=\"$(pkgdatadir)\" \ -DLIBEXECDIR=\"$(libexecdir)\" \ diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am index a46113c..bf7c6a9 100644 --- a/src/tests/Makefile.am +++ b/src/tests/Makefile.am @@ -24,7 +24,7 @@ NULL = DEPS = $(top_builddir)/src/libibus-@IBUS_API_VERSION@.la -INCLUDES = \ +AM_CPPFLAGS = \ -g \ @GLIB2_CFLAGS@ \ @GIO2_CFLAGS@ \ diff --git a/tools/Makefile.am b/tools/Makefile.am index bcb67db..bd92441 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 \ diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am index 183ea6f..ab58f20 100644 --- a/ui/gtk3/Makefile.am +++ b/ui/gtk3/Makefile.am @@ -35,23 +35,21 @@ gtkpanel.xml: gtkpanel.xml.in -e 's|@libexecdir[@]|$(libexecdir)|g' $< > $@.tmp && \ mv $@.tmp $@ -INCLUDES = \ +# force include config.h before gi18n.h. +AM_CPPFLAGS = \ -I$(top_srcdir)/src \ -I$(top_builddir)/src \ + -include $(CONFIG_HEADER) \ $(NULL) USE_SYMBOL_ICON = FALSE -# force include config.h before gi18n.h. -AM_CPPFLAGS = -include $(CONFIG_HEADER) - AM_CFLAGS = \ @GLIB2_CFLAGS@ \ @GIO2_CFLAGS@ \ @GTHREAD2_CFLAGS@ \ @GTK3_CFLAGS@ \ @X11_CFLAGS@ \ - $(INCLUDES) \ -DG_LOG_DOMAIN=\"IBUS\" \ -DBINDIR=\"$(bindir)\" \ -DIBUS_DISABLE_DEPRECATED \ -- 2.7.4