[seahorse] Fix up automake and compiler warnings

[Stefan Walter <stefw src gnome org>]

commit 3d2c3708224da1f103e7796696beb8ec49b274d1
Author: Stef Walter <stefw gnome org>
Date:   Sat Oct 19 06:15:38 2013 +0200

    Fix up automake and compiler warnings

 common/Makefile.am      |    2 +-
 gkr/Makefile.am         |    2 +-
 libegg/Makefile.am      |   10 ++++------
 libseahorse/Makefile.am |    2 +-
 pgp/Makefile.am         |    2 +-
 pkcs11/Makefile.am      |    2 +-
 src/Makefile.am         |    2 +-
 ssh/Makefile.am         |    2 +-
 8 files changed, 11 insertions(+), 13 deletions(-)
---
diff --git a/common/Makefile.am b/common/Makefile.am
index 59d5bf3..a831521 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -2,7 +2,7 @@ NULL =
 
 uidir = $(datadir)/seahorse/ui/
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
        -I$(top_srcdir) \
        -DPKGDATADIR=\""$(pkgdatadir)/"\" \
        -DUIDIR=\""$(uidir)"\" \
diff --git a/gkr/Makefile.am b/gkr/Makefile.am
index ba3d781..46c6ac9 100644
--- a/gkr/Makefile.am
+++ b/gkr/Makefile.am
@@ -4,7 +4,7 @@ uidir = $(pkgdatadir)/ui
 localedir = $(datadir)/locale
 seahorselibexecbindir = $(libdir)/seahorse/
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/common \
        -I$(top_srcdir)/libseahorse \
diff --git a/libegg/Makefile.am b/libegg/Makefile.am
index 872adb7..fe3379a 100644
--- a/libegg/Makefile.am
+++ b/libegg/Makefile.am
@@ -2,19 +2,17 @@ noinst_LTLIBRARIES = \
        libeggdatetime.la \
        libeggtreemultidnd.la
 
-libeggdatetime_la_INCLUDES = -DGTK_DISABLE_DEPRECATED \
+libeggdatetime_la_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \
                                 -DGDK_DISABLE_DEPRECATED \
-                                -DG_DISABLE_DEPRECATED \
-                                -DGETTEXT_PACKAGE=NULL
+                                -DG_DISABLE_DEPRECATED
 
 libeggdatetime_la_LIBADD = $(GTK_LIBS)
 libeggdatetime_la_CFLAGS = $(GTK_CFLAGS)
 libeggdatetime_la_SOURCES = egg-datetime.h egg-datetime.c
 
-libeggtreemultidnd_la_INCLUDES = -DGTK_DISABLE_DEPRECATED \
+libeggtreemultidnd_la_CPPFLAGS = -DGTK_DISABLE_DEPRECATED \
                                 -DGDK_DISABLE_DEPRECATED \
-                                -DG_DISABLE_DEPRECATED \
-                                -DGETTEXT_PACKAGE=NULL
+                                -DG_DISABLE_DEPRECATED
 
 libeggtreemultidnd_la_LIBADD = $(GTK_LIBS)
 libeggtreemultidnd_la_CFLAGS = $(GTK_CFLAGS)
diff --git a/libseahorse/Makefile.am b/libseahorse/Makefile.am
index 46679f9..e075410 100644
--- a/libseahorse/Makefile.am
+++ b/libseahorse/Makefile.am
@@ -3,7 +3,7 @@ uidir = $(datadir)/seahorse/ui/
 localedir = $(datadir)/locale
 seahorselibexecbindir = $(libdir)/seahorse/
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/common \
        -I$(top_srcdir)/libegg \
diff --git a/pgp/Makefile.am b/pgp/Makefile.am
index 65390a2..4256ecf 100644
--- a/pgp/Makefile.am
+++ b/pgp/Makefile.am
@@ -3,7 +3,7 @@ uidir = $(datadir)/seahorse/ui/
 localedir = $(datadir)/locale
 seahorselibexecbindir = $(libdir)/seahorse/
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/libegg \
        -I$(top_srcdir)/common \
diff --git a/pkcs11/Makefile.am b/pkcs11/Makefile.am
index 778df1b..9f367ab 100644
--- a/pkcs11/Makefile.am
+++ b/pkcs11/Makefile.am
@@ -7,7 +7,7 @@ seahorselibexecbindir = $(libdir)/seahorse/
 # Generate seahorse-pkcs11.h before building libseahorse_pkcs11_la_SOURCES
 BUILT_SOURCES = libvala_code_la_vala.stamp
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/common \
        -I$(top_srcdir)/libseahorse \
diff --git a/src/Makefile.am b/src/Makefile.am
index fec9779..f9b0dcd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3,7 +3,7 @@ include $(top_srcdir)/Makefile.decl
 uidir = $(datadir)/seahorse/ui/
 localedir = $(datadir)/locale
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/common \
        -I$(top_srcdir)/libseahorse \
diff --git a/ssh/Makefile.am b/ssh/Makefile.am
index 8a915a6..ab012a1 100644
--- a/ssh/Makefile.am
+++ b/ssh/Makefile.am
@@ -3,7 +3,7 @@ uidir = $(datadir)/seahorse/ui/
 localedir = $(datadir)/locale
 seahorselibexecbindir = $(libdir)/seahorse/
 
-INCLUDES = -I$(top_builddir) \
+AM_CPPFLAGS = -I$(top_builddir) \
        -I$(top_srcdir) \
        -I$(top_srcdir)/common \
        -I$(top_srcdir)/libseahorse \