summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2013-08-03 01:48:25 -0700
committerStefano Karapetsas <[email protected]>2013-08-03 01:48:25 -0700
commit8e0336cb256cfde2485a7321f773d916ab3e33fb (patch)
tree46c2d011d0b2def04861e2b4c6c8d67962fcd405
parentd5249f5fe6ec943e813fe32ad47035aac543bbf3 (diff)
parent06ae9932b08699d0137d5049c58b87be3e3072b9 (diff)
downloadpluma-8e0336cb256cfde2485a7321f773d916ab3e33fb.tar.bz2
pluma-8e0336cb256cfde2485a7321f773d916ab3e33fb.tar.xz
Merge pull request #26 from infirit/master
Make automake happy: INCLUDES -> AM_CPPFLAGS
-rw-r--r--plugin-loaders/c/Makefile.am2
-rw-r--r--plugin-loaders/python/Makefile.am2
-rw-r--r--plugins/changecase/Makefile.am2
-rw-r--r--plugins/checkupdate/Makefile.am2
-rwxr-xr-xplugins/docinfo/Makefile.am2
-rw-r--r--plugins/filebrowser/Makefile.am2
-rw-r--r--plugins/modelines/Makefile.am2
-rwxr-xr-xplugins/sort/Makefile.am2
-rwxr-xr-xplugins/spell/Makefile.am2
-rwxr-xr-xplugins/taglist/Makefile.am2
-rwxr-xr-xplugins/time/Makefile.am2
-rw-r--r--pluma/Makefile.am2
-rwxr-xr-xpluma/dialogs/Makefile.am2
-rwxr-xr-xpluma/osx/Makefile.am2
-rwxr-xr-xpluma/smclient/Makefile.am2
-rw-r--r--tests/Makefile.am2
16 files changed, 16 insertions, 16 deletions
diff --git a/plugin-loaders/c/Makefile.am b/plugin-loaders/c/Makefile.am
index be5df5ef..571c79d4 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 ffbe0cd7..8cb55668 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 3886dc86..6b3a1cdd 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 471f8b04..fe565398 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 27290fc7..ec9fc410 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 cb03c183..d6d5cfad 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 d1b59b85..e375c898 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 52274688..749be6bc 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 24299165..7c08bf99 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 dd3306f0..fcc18345 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 398e84b4..73942880 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 f7982a43..ece87381 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 c8033e9b..19a5c18e 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 994b9ff7..c9192b13 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 4f6d1d70..481cd914 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 480bf30b..b5ce29df 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