[niepce] fwk: move gphoto to toolkit from utils

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

commit a9e1a18e772021b46aec34914dd23555a472793d
Author: Hubert Figuière <hub figuiere net>
Date:   Fri May 26 22:05:14 2017 -0400

    fwk: move gphoto to toolkit from utils

 camerawire/src/cwwindow.hpp            |    2 +-
 src/engine/importer/cameraimporter.hpp |    2 +-
 src/fwk/toolkit/Makefile.am            |    2 ++
 src/fwk/{utils => toolkit}/gphoto.cpp  |    2 +-
 src/fwk/{utils => toolkit}/gphoto.hpp  |    4 ++--
 src/fwk/utils/Makefile.am              |    3 +--
 6 files changed, 8 insertions(+), 7 deletions(-)
---
diff --git a/camerawire/src/cwwindow.hpp b/camerawire/src/cwwindow.hpp
index a2177d5..f0017de 100644
--- a/camerawire/src/cwwindow.hpp
+++ b/camerawire/src/cwwindow.hpp
@@ -27,7 +27,7 @@
 #include <gtkmm/treemodel.h>
 #include <gtkmm/treeview.h>
 
-#include "fwk/utils/gphoto.hpp"
+#include "fwk/toolkit/gphoto.hpp"
 #include "fwk/toolkit/appframe.hpp"
 
 namespace cw {
diff --git a/src/engine/importer/cameraimporter.hpp b/src/engine/importer/cameraimporter.hpp
index 61f0fe7..d0d9bf8 100644
--- a/src/engine/importer/cameraimporter.hpp
+++ b/src/engine/importer/cameraimporter.hpp
@@ -24,7 +24,7 @@
 #include <list>
 
 #include "fwk/utils/files.hpp"
-#include "fwk/utils/gphoto.hpp"
+#include "fwk/toolkit/gphoto.hpp"
 #include "engine/importer/iimporter.hpp"
 
 namespace eng {
diff --git a/src/fwk/toolkit/Makefile.am b/src/fwk/toolkit/Makefile.am
index a663de0..3b9f915 100644
--- a/src/fwk/toolkit/Makefile.am
+++ b/src/fwk/toolkit/Makefile.am
@@ -5,6 +5,7 @@
 AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/src/ext \
        -DDATADIR=\"$(datadir)\" \
        @FRAMEWORK_CFLAGS@ \
+       @GPHOTO_CFLAGS@ \
        @OPENRAW_CFLAGS@ \
        $(NULL)
 
@@ -41,6 +42,7 @@ libniepceframework_a_SOURCES = configuration.hpp configuration.cpp \
        configdatabinder.hpp configdatabinder.cpp \
        gdkutils.hpp gdkutils.cpp \
        gtkutils.hpp gtkutils.cpp \
+       gphoto.hpp gphoto.cpp \
        widgets/addinstreemodel.hpp widgets/addinstreemodel.cpp \
        widgets/ratinglabel.hpp widgets/ratinglabel.cpp \
        widgets/toolboxitemwidget.hpp widgets/toolboxitemwidget.cpp \
diff --git a/src/fwk/utils/gphoto.cpp b/src/fwk/toolkit/gphoto.cpp
similarity index 99%
rename from src/fwk/utils/gphoto.cpp
rename to src/fwk/toolkit/gphoto.cpp
index 644bb86..1fbb702 100644
--- a/src/fwk/utils/gphoto.cpp
+++ b/src/fwk/toolkit/gphoto.cpp
@@ -1,6 +1,6 @@
 /* -*- mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode:nil; -*- */
 /*
- * niepce - fwk/utils/gphoto.cpp
+ * niepce - fwk/toolkit/gphoto.cpp
  *
  * Copyright (C) 2009-2017 Hubert Figuiere
  *
diff --git a/src/fwk/utils/gphoto.hpp b/src/fwk/toolkit/gphoto.hpp
similarity index 97%
rename from src/fwk/utils/gphoto.hpp
rename to src/fwk/toolkit/gphoto.hpp
index 473ad4b..7e3d6d9 100644
--- a/src/fwk/utils/gphoto.hpp
+++ b/src/fwk/toolkit/gphoto.hpp
@@ -1,8 +1,8 @@
 /* -*- mode: C++; tab-width: 4; c-basic-offset: 4; indent-tabs-mode:nil; -*- */
 /*
- * niepce - fwk/utils/gphoto.hpp
+ * niepce - fwk/toolkit/gphoto.hpp
  *
- * Copyright (C) 2009-2013 Hubert Figuiere
+ * Copyright (C) 2009-2017 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/fwk/utils/Makefile.am b/src/fwk/utils/Makefile.am
index 0965843..6e38035 100644
--- a/src/fwk/utils/Makefile.am
+++ b/src/fwk/utils/Makefile.am
@@ -2,7 +2,7 @@
 DIST_SUBDIRS = db
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/ \
-       @FRAMEWORK_CFLAGS@ @GPHOTO_CFLAGS@
+       @FRAMEWORK_CFLAGS@
 
 TESTS = testfiles testxmp \
        testpathutils \
@@ -72,7 +72,6 @@ libniepceutils_a_SOURCES = \
        buffer.hpp logstreamutils.hpp \
        boost.hpp \
        files.hpp files.cpp \
-       gphoto.hpp gphoto.cpp \
        thread.hpp thread.cpp worker.hpp \
        pathutils.hpp pathutils.cpp \
        databinder.hpp databinder.cpp \