From 06ae9932b08699d0137d5049c58b87be3e3072b9 Mon Sep 17 00:00:00 2001 From: infirit Date: Sat, 3 Aug 2013 00:08:36 +0200 Subject: [PATCH] Make automake happy: INCLUDES -> AM_CPPFLAGS --- plugin-loaders/c/Makefile.am | 2 +- plugin-loaders/python/Makefile.am | 2 +- plugins/changecase/Makefile.am | 2 +- plugins/checkupdate/Makefile.am | 2 +- plugins/docinfo/Makefile.am | 2 +- plugins/filebrowser/Makefile.am | 2 +- plugins/modelines/Makefile.am | 2 +- plugins/sort/Makefile.am | 2 +- plugins/spell/Makefile.am | 2 +- plugins/taglist/Makefile.am | 2 +- plugins/time/Makefile.am | 2 +- pluma/Makefile.am | 2 +- pluma/dialogs/Makefile.am | 2 +- pluma/osx/Makefile.am | 2 +- pluma/smclient/Makefile.am | 2 +- tests/Makefile.am | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/plugin-loaders/c/Makefile.am b/plugin-loaders/c/Makefile.am index be5df5e..571c79d 100644 --- a/plugin-loaders/c/Makefile.am +++ b/plugin-loaders/c/Makefile.am @@ -2,7 +2,7 @@ loaderdir = $(libdir)/pluma/plugin-loaders -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/plugin-loaders/python/Makefile.am b/plugin-loaders/python/Makefile.am index ffbe0cd..8cb5566 100644 --- a/plugin-loaders/python/Makefile.am +++ b/plugin-loaders/python/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS = bindings loaderdir = $(libdir)/pluma/plugin-loaders -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/pluma \ diff --git a/plugins/changecase/Makefile.am b/plugins/changecase/Makefile.am index 3886dc8..6b3a1cd 100644 --- a/plugins/changecase/Makefile.am +++ b/plugins/changecase/Makefile.am @@ -1,7 +1,7 @@ # changecase plugin plugindir = $(PLUMA_PLUGINS_LIBS_DIR) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/plugins/checkupdate/Makefile.am b/plugins/checkupdate/Makefile.am index 471f8b0..fe56539 100644 --- a/plugins/checkupdate/Makefile.am +++ b/plugins/checkupdate/Makefile.am @@ -2,7 +2,7 @@ plugindir = $(PLUMA_PLUGINS_LIBS_DIR) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ $(LIBSOUP_CFLAGS) \ diff --git a/plugins/docinfo/Makefile.am b/plugins/docinfo/Makefile.am index 27290fc..ec9fc41 100755 --- a/plugins/docinfo/Makefile.am +++ b/plugins/docinfo/Makefile.am @@ -1,7 +1,7 @@ # docinfo plugin plugindir = $(PLUMA_PLUGINS_LIBS_DIR) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am index cb03c18..d6d5cfa 100644 --- a/plugins/filebrowser/Makefile.am +++ b/plugins/filebrowser/Makefile.am @@ -2,7 +2,7 @@ plugindir = $(PLUMA_PLUGINS_LIBS_DIR) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/plugins/modelines/Makefile.am b/plugins/modelines/Makefile.am index d1b59b8..e375c89 100644 --- a/plugins/modelines/Makefile.am +++ b/plugins/modelines/Makefile.am @@ -1,7 +1,7 @@ # Modelines Plugin plugindir = $(PLUMA_PLUGINS_LIBS_DIR) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/plugins/sort/Makefile.am b/plugins/sort/Makefile.am index 5227468..749be6b 100755 --- a/plugins/sort/Makefile.am +++ b/plugins/sort/Makefile.am @@ -1,7 +1,7 @@ # sort plugin plugindir = $(PLUMA_PLUGINS_LIBS_DIR) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/plugins/spell/Makefile.am b/plugins/spell/Makefile.am index 2429916..7c08bf9 100755 --- a/plugins/spell/Makefile.am +++ b/plugins/spell/Makefile.am @@ -1,7 +1,7 @@ # Spell checker plugin plugindir = $(PLUMA_PLUGINS_LIBS_DIR) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ $(ENCHANT_CFLAGS) \ diff --git a/plugins/taglist/Makefile.am b/plugins/taglist/Makefile.am index dd3306f..fcc1834 100755 --- a/plugins/taglist/Makefile.am +++ b/plugins/taglist/Makefile.am @@ -11,7 +11,7 @@ taglist_in_files = \ taglist_DATA = $(taglist_in_files:.tags.xml.in=.tags.gz) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am index 398e84b..7394288 100755 --- a/plugins/time/Makefile.am +++ b/plugins/time/Makefile.am @@ -1,7 +1,7 @@ # time plugin plugindir = $(PLUMA_PLUGINS_LIBS_DIR) -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ $(PLUMA_CFLAGS) \ $(WARN_CFLAGS) \ diff --git a/pluma/Makefile.am b/pluma/Makefile.am index f7982a4..ece8738 100644 --- a/pluma/Makefile.am +++ b/pluma/Makefile.am @@ -9,7 +9,7 @@ bin_PROGRAMS = pluma noinst_LTLIBRARIES = libpluma.la -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(srcdir) \ -I$(srcdir)/smclient \ diff --git a/pluma/dialogs/Makefile.am b/pluma/dialogs/Makefile.am index c8033e9..19a5c18 100755 --- a/pluma/dialogs/Makefile.am +++ b/pluma/dialogs/Makefile.am @@ -1,6 +1,6 @@ uidir = $(datadir)/pluma/ui/ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/pluma \ diff --git a/pluma/osx/Makefile.am b/pluma/osx/Makefile.am index 994b9ff..c9192b1 100755 --- a/pluma/osx/Makefile.am +++ b/pluma/osx/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/pluma \ diff --git a/pluma/smclient/Makefile.am b/pluma/smclient/Makefile.am index 4f6d1d7..481cd91 100755 --- a/pluma/smclient/Makefile.am +++ b/pluma/smclient/Makefile.am @@ -14,7 +14,7 @@ platform_sources = eggsmclient-xsmp.c endif endif -INCLUDES = \ +AM_CPPFLAGS = \ -DG_LOG_DOMAIN=\""EggSMClient"\" \ $(PLUMA_CFLAGS) \ $(platform_defines) \ diff --git a/tests/Makefile.am b/tests/Makefile.am index 480bf30..b5ce29d 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/pluma $(PLUMA_DEBUG_FLAGS) $(PLUMA_CFLAGS) +AM_CPPFLAGS = -g -I$(top_srcdir) -I$(top_srcdir)/pluma $(PLUMA_DEBUG_FLAGS) $(PLUMA_CFLAGS) noinst_PROGRAMS = $(TEST_PROGS) progs_ldadd = $(top_builddir)/pluma/libpluma.la