[niepce] INCLUDES -> AM_CPPFLAGS to comply with newer automake.

[Hubert Figuière <hub src gnome org>]

commit 7569ea3e8629327790d8fa8a146af4b8342423ad
Author: Hubert Figuière <hub figuiere net>
Date:   Fri Jul 4 20:12:09 2014 -0400

    INCLUDES -> AM_CPPFLAGS to comply with newer automake.

 src/engine/db/Makefile.am                 |    8 ++++----
 src/engine/library/Makefile.am            |    2 +-
 src/ext/libview/Makefile.am               |    4 ++--
 src/fwk/base/Makefile.am                  |    2 +-
 src/fwk/toolkit/Makefile.am               |    2 +-
 src/fwk/utils/Makefile.am                 |    2 +-
 src/libraryclient/Makefile.am             |    2 +-
 src/ncr/Makefile.am                       |    2 +-
 src/niepce/Makefile.am                    |    9 ++++-----
 src/niepce/modules/darkroom/Makefile.am   |    3 ++-
 src/niepce/modules/interfaces/Makefile.am |    4 ++--
 src/niepce/ui/Makefile.am                 |    3 +--
 src/niepce/ui/thumb-view/Makefile.am      |    4 ++--
 13 files changed, 23 insertions(+), 24 deletions(-)
---
diff --git a/src/engine/db/Makefile.am b/src/engine/db/Makefile.am
index d28e1f1..41a2052 100644
--- a/src/engine/db/Makefile.am
+++ b/src/engine/db/Makefile.am
@@ -1,8 +1,8 @@
 
 
-SUBDIRS = 
+SUBDIRS =
 
-INCLUDES = -I$(top_srcdir)/src/  @EXEMPI_CFLAGS@ @LIBGLIBMM_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/src/  @EXEMPI_CFLAGS@ @LIBGLIBMM_CFLAGS@
 
 TESTS = test_library test_filebundle
 
@@ -19,10 +19,10 @@ TEST_LIBS =  \
 check_PROGRAMS = test_library test_filebundle
 
 test_library_SOURCES = test_library.cpp
-test_library_LDADD = $(TEST_LIBS)  
+test_library_LDADD = $(TEST_LIBS)
 
 test_filebundle_SOURCES = test_filebundle.cpp
-test_filebundle_LDADD = $(TEST_LIBS)  
+test_filebundle_LDADD = $(TEST_LIBS)
 
 noinst_LIBRARIES = libniepcedb.a
 
diff --git a/src/engine/library/Makefile.am b/src/engine/library/Makefile.am
index ca889e6..56c95b9 100644
--- a/src/engine/library/Makefile.am
+++ b/src/engine/library/Makefile.am
@@ -1,6 +1,6 @@
 
 
-INCLUDES = -I$(top_srcdir)/src/ \
+AM_CPPFLAGS = -I$(top_srcdir)/src/ \
        @LIBGLIBMM_CFLAGS@ @LIBGTKMM_CFLAGS@ \
        @OPENRAW_CFLAGS@ @EXEMPI_CFLAGS@
 
diff --git a/src/ext/libview/Makefile.am b/src/ext/libview/Makefile.am
index 11f830c..fe889af 100644
--- a/src/ext/libview/Makefile.am
+++ b/src/ext/libview/Makefile.am
@@ -1,8 +1,8 @@
 
 
-INCLUDES = -I$(top_srcdir)/src/ext/ @LIBGTKMM_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/src/ext/ @LIBGTKMM_CFLAGS@
 
 noinst_LIBRARIES = libview.a
 
 
-libview_a_SOURCES = header.hh header.cc
\ No newline at end of file
+libview_a_SOURCES = header.hh header.cc
diff --git a/src/fwk/base/Makefile.am b/src/fwk/base/Makefile.am
index 2e33b87..8995ab2 100644
--- a/src/fwk/base/Makefile.am
+++ b/src/fwk/base/Makefile.am
@@ -1,5 +1,5 @@
 
-INCLUDES = -I$(top_srcdir)/src \
+AM_CPPFLAGS = -I$(top_srcdir)/src \
        @BOOST_CPPFLAGS@ \
        @EXEMPI_CFLAGS@ \
        $(NULL)
diff --git a/src/fwk/toolkit/Makefile.am b/src/fwk/toolkit/Makefile.am
index bc6d20f..d49e806 100644
--- a/src/fwk/toolkit/Makefile.am
+++ b/src/fwk/toolkit/Makefile.am
@@ -2,7 +2,7 @@
 
 
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/ext \
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/ext \
        -DDATADIR=\"$(datadir)\" \
        @LIBGLIBMM_CFLAGS@ \
        @LIBGTKMM_CFLAGS@ \
diff --git a/src/fwk/utils/Makefile.am b/src/fwk/utils/Makefile.am
index dc77e2a..1fe56a6 100644
--- a/src/fwk/utils/Makefile.am
+++ b/src/fwk/utils/Makefile.am
@@ -1,7 +1,7 @@
 
 DIST_SUBDIRS = db
 
-INCLUDES = -I$(top_srcdir)/src/ @LIBGLIBMM_CFLAGS@ \
+AM_CPPFLAGS = -I$(top_srcdir)/src/ @LIBGLIBMM_CFLAGS@ \
        @EXEMPI_CFLAGS@ @LIBXML2_CFLAGS@ @GPHOTO_CFLAGS@
 
 TESTS = testfiles testxmp \
diff --git a/src/libraryclient/Makefile.am b/src/libraryclient/Makefile.am
index 2708fd3..a9dd336 100644
--- a/src/libraryclient/Makefile.am
+++ b/src/libraryclient/Makefile.am
@@ -1,6 +1,6 @@
 
 
-INCLUDES = -I$(top_srcdir)/src @EXEMPI_CFLAGS@ @LIBGLIBMM_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/src @EXEMPI_CFLAGS@ @LIBGLIBMM_CFLAGS@
 
 noinst_LIBRARIES = liblibraryclient.a
 
diff --git a/src/ncr/Makefile.am b/src/ncr/Makefile.am
index aecf568..70200fd 100644
--- a/src/ncr/Makefile.am
+++ b/src/ncr/Makefile.am
@@ -1,7 +1,7 @@
 
 
 
-INCLUDES = -I$(top_srcdir)/src  \
+AM_CPPFLAGS = -I$(top_srcdir)/src  \
        @LIBGTKMM_CFLAGS@ \
        @BABL_CFLAGS@ @GEGL_CFLAGS@ @OPENRAW_CFLAGS@
 
diff --git a/src/niepce/Makefile.am b/src/niepce/Makefile.am
index d6e472d..ca0fba4 100644
--- a/src/niepce/Makefile.am
+++ b/src/niepce/Makefile.am
@@ -1,15 +1,14 @@
 
 SUBDIRS = ui modules
 
-INCLUDES = -DDATADIR=\"$(datadir)\" \
+AM_CPPFLAGS = -DDATADIR=\"$(datadir)\" \
        -I$(top_srcdir)/src/niepce -I$(top_srcdir)/src  \
-       @EXEMPI_CFLAGS@ @LIBGLIBMM_CFLAGS@
+       @EXEMPI_CFLAGS@ @LIBGLIBMM_CFLAGS@ \
+       @LIBGTKMM_CFLAGS@ \
+       -DNIEPCE_LOCALEDIR=\"@NIEPCE_LOCALEDIR \"
 
 bin_PROGRAMS = niepce
 
-niepce_CPPFLAGS = @LIBGTKMM_CFLAGS@ \
-       -DNIEPCE_LOCALEDIR=\"@NIEPCE_LOCALEDIR \"
-
 niepce_LDFLAGS =
 niepce_LDADD = \
        $(top_builddir)/src/engine/db/libniepcedb.a \
diff --git a/src/niepce/modules/darkroom/Makefile.am b/src/niepce/modules/darkroom/Makefile.am
index 846293b..7e57f59 100644
--- a/src/niepce/modules/darkroom/Makefile.am
+++ b/src/niepce/modules/darkroom/Makefile.am
@@ -1,6 +1,7 @@
 
 
-INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/niepce -I$(top_srcdir)/src/ext \
+AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/niepce \
+       -I$(top_srcdir)/src/ext \
        -DGLADEDIR=\"$(gladedir)\" \
        -DDATADIR=\"$(datadir)\" \
        @LIBGLIBMM_CFLAGS@ \
diff --git a/src/niepce/modules/interfaces/Makefile.am b/src/niepce/modules/interfaces/Makefile.am
index 36476f7..5d04fa7 100644
--- a/src/niepce/modules/interfaces/Makefile.am
+++ b/src/niepce/modules/interfaces/Makefile.am
@@ -1,6 +1,6 @@
 
 
-INCLUDES = -I$(top_srcdir)/src/ \
+AM_CPPFLAGS = -I$(top_srcdir)/src/ \
        @EXEMPI_CFLAGS@ \
        @LIBGLIBMM_CFLAGS@ \
        @LIBGTKMM_CFLAGS@
@@ -12,4 +12,4 @@ noinst_HEADERS = ipostimportprocessing.hpp \
 noinst_LIBRARIES = libinterfaces.a
 
 libinterfaces_a_SOURCES = ipostimportprocessing.cpp \
-       $(NULL)
\ No newline at end of file
+       $(NULL)
diff --git a/src/niepce/ui/Makefile.am b/src/niepce/ui/Makefile.am
index 36eff05..56c1f67 100644
--- a/src/niepce/ui/Makefile.am
+++ b/src/niepce/ui/Makefile.am
@@ -10,7 +10,7 @@ gladefiles = dialogs/preferences.ui \
 gladedir = @datarootdir@/niepce/glade/
 glade_DATA = $(gladefiles)
 
-INCLUDES = -I$(top_srcdir)/src/ -I$(srcdir)/.. -I$(srcdir)/thumb-view \
+AM_CPPFLAGS = -I$(top_srcdir)/src/ -I$(srcdir)/.. -I$(srcdir)/thumb-view \
        -I$(top_srcdir)/src/ext \
        -DGLADEDIR=\"$(gladedir)\" \
        -DDATADIR=\"$(datadir)\" \
@@ -24,7 +24,6 @@ noinst_LIBRARIES = libniepceui.a
 
 PUBLICHEADERS = ilibrarymodule.hpp imoduleshell.hpp
 
-libniepceui_a_CPPFLAGS = 
 libniepceui_a_SOURCES = \
        niepcewindow.hpp niepcewindow.cpp \
        niepceapplication.hpp niepceapplication.cpp \
diff --git a/src/niepce/ui/thumb-view/Makefile.am b/src/niepce/ui/thumb-view/Makefile.am
index b3dfb07..01cc57c 100644
--- a/src/niepce/ui/thumb-view/Makefile.am
+++ b/src/niepce/ui/thumb-view/Makefile.am
@@ -1,10 +1,10 @@
 
 
-INCLUDES = -I$(srcdir) -I$(top_srcdir)/src
+AM_CPPFLAGS = -I$(srcdir) -I$(top_srcdir)/src
 
 noinst_LTLIBRARIES = libthumbview.la
 
-noinst_HEADERS = eog-thumb-nav.hpp eog-thumb-view.hpp 
+noinst_HEADERS = eog-thumb-nav.hpp eog-thumb-view.hpp
 
 libthumbview_la_CPPFLAGS =  @LIBGTKMM_CFLAGS@ \
        @GNOMEVFS_CFLAGS@