[gedit] Cleanup some Makefile.am

[Paolo Borelli <pborelli src gnome org>]

commit 16f67fce9c71d477a89eac8169b3d3f035df7517
Author: Paolo Borelli <pborelli gnome org>
Date:   Sat May 18 10:26:19 2013 +0200

    Cleanup some Makefile.am
    
    Use AM_CPPFLAGS instead of the old INCLUDES

 plugins/changecase/Makefile.am  |    4 +---
 plugins/checkupdate/Makefile.am |    4 +---
 plugins/docinfo/Makefile.am     |    3 +--
 plugins/filebrowser/Makefile.am |    4 +---
 plugins/modelines/Makefile.am   |    4 +---
 plugins/sort/Makefile.am        |    4 +---
 plugins/spell/Makefile.am       |    3 +--
 plugins/time/Makefile.am        |    3 +--
 plugins/zeitgeist/Makefile.am   |    3 +--
 tests/Makefile.am               |    9 ++++++---
 10 files changed, 15 insertions(+), 26 deletions(-)
---
diff --git a/plugins/changecase/Makefile.am b/plugins/changecase/Makefile.am
index d0af857..371d94e 100644
--- a/plugins/changecase/Makefile.am
+++ b/plugins/changecase/Makefile.am
@@ -1,7 +1,6 @@
-# changecase plugin
 plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                                 \
        $(GEDIT_CFLAGS)                                 \
        $(WARN_CFLAGS)                                  \
@@ -30,5 +29,4 @@ EXTRA_DIST = $(ui_DATA) $(plugin_in_files)
 CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
-
 -include $(top_srcdir)/git.mk
diff --git a/plugins/checkupdate/Makefile.am b/plugins/checkupdate/Makefile.am
index 94a6600..470ed61 100644
--- a/plugins/checkupdate/Makefile.am
+++ b/plugins/checkupdate/Makefile.am
@@ -1,8 +1,6 @@
-# gedit win32 updater
-
 plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                                                 \
        $(GEDIT_CFLAGS)                                                 \
        $(LIBSOUP_CFLAGS)                                               \
diff --git a/plugins/docinfo/Makefile.am b/plugins/docinfo/Makefile.am
index a5f368b..49a1e53 100644
--- a/plugins/docinfo/Makefile.am
+++ b/plugins/docinfo/Makefile.am
@@ -1,7 +1,6 @@
-# docinfo plugin
 plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                                 \
        $(GEDIT_CFLAGS)                                 \
        $(WARN_CFLAGS)                                  \
diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am
index 13e6bd7..d0a558d 100644
--- a/plugins/filebrowser/Makefile.am
+++ b/plugins/filebrowser/Makefile.am
@@ -1,8 +1,6 @@
-# filebrowser
-
 plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                                                 \
        $(GEDIT_CFLAGS)                                                 \
        $(WARN_CFLAGS)                                                  \
diff --git a/plugins/modelines/Makefile.am b/plugins/modelines/Makefile.am
index 72c2701..6698749 100644
--- a/plugins/modelines/Makefile.am
+++ b/plugins/modelines/Makefile.am
@@ -1,7 +1,6 @@
-# Modelines Plugin
 plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                                 \
        $(GEDIT_CFLAGS)                                 \
        $(WARN_CFLAGS)                                  \
@@ -34,5 +33,4 @@ EXTRA_DIST = \
 CLEANFILES = $(plugin_DATA)
 DISTCLEANFILES = $(plugin_DATA)
 
-
 -include $(top_srcdir)/git.mk
diff --git a/plugins/sort/Makefile.am b/plugins/sort/Makefile.am
index 0d0b439..611323b 100644
--- a/plugins/sort/Makefile.am
+++ b/plugins/sort/Makefile.am
@@ -1,7 +1,6 @@
-# sort plugin
 plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                                 \
        $(GEDIT_CFLAGS)                                 \
        $(WARN_CFLAGS)                                  \
@@ -37,5 +36,4 @@ EXTRA_DIST = \
 CLEANFILES = $(BUILT_SOURCES) $(plugin_DATA)
 DISTCLEANFILES = $(BUILT_SOURCES) $(plugin_DATA)
 
-
 -include $(top_srcdir)/git.mk
diff --git a/plugins/spell/Makefile.am b/plugins/spell/Makefile.am
index 0b97ec1..a113b0d 100644
--- a/plugins/spell/Makefile.am
+++ b/plugins/spell/Makefile.am
@@ -1,7 +1,6 @@
-# Spell checker plugin
 plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
-INCLUDES =                                                     \
+AM_CPPFLAGS =                                                  \
        -I$(top_srcdir)                                         \
        $(GEDIT_CFLAGS)                                         \
        $(ENCHANT_CFLAGS)                                       \
diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am
index 73de45b..39bd012 100644
--- a/plugins/time/Makefile.am
+++ b/plugins/time/Makefile.am
@@ -1,7 +1,6 @@
-# time plugin
 plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                                 \
        $(GEDIT_CFLAGS)                                 \
        $(WARN_CFLAGS)                                  \
diff --git a/plugins/zeitgeist/Makefile.am b/plugins/zeitgeist/Makefile.am
index 8e7d07b..fe5f4d0 100644
--- a/plugins/zeitgeist/Makefile.am
+++ b/plugins/zeitgeist/Makefile.am
@@ -1,7 +1,6 @@
-# zeitgeist plugin
 plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)                                 \
        $(GEDIT_CFLAGS)                                 \
        $(ZEITGEIST_CFLAGS)                             \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 817bba1..7d03798 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,10 @@
-INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/gedit $(GEDIT_DEBUG_FLAGS) $(GEDIT_CFLAGS)
+AM_CPPFLAGS = \
+       -I$(top_srcdir) \
+       -I$(top_srcdir)/gedit \
+       $(GEDIT_CFLAGS)
 
-noinst_PROGRAMS = $(TEST_PROGS) $(TEST_GTK_PROGS)
-progs_ldadd     = $(top_builddir)/gedit/libgedit.la
+noinst_PROGRAMS        = $(TEST_PROGS) $(TEST_GTK_PROGS)
+progs_ldadd    = $(top_builddir)/gedit/libgedit.la
 
 TEST_PROGS                     = document-input-stream
 document_input_stream_SOURCES  = document-input-stream.c