[ostree] src: Move ot-tool-util from ostree/ to libotutil/

[Giuseppe Scrivano <gscrivano src gnome org>]

commit c70abfd43cbc16056a51d64fd12a9d0a21a81a1b
Author: Giuseppe Scrivano <gscrivan redhat com>
Date:   Fri Mar 6 12:21:07 2015 +0100

    src: Move ot-tool-util from ostree/ to libotutil/
    
    These utilities are not actually specific to the ostree commandline.
    
    Signed-off-by: Giuseppe Scrivano <gscrivan redhat com>

 Makefile-ostree.am                       |    2 --
 Makefile-otutil.am                       |    2 ++
 src/{ostree => libotutil}/ot-tool-util.c |    2 --
 src/{ostree => libotutil}/ot-tool-util.h |    1 -
 4 files changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/Makefile-ostree.am b/Makefile-ostree.am
index 78ef214..0061de4 100644
--- a/Makefile-ostree.am
+++ b/Makefile-ostree.am
@@ -48,8 +48,6 @@ ostree_SOURCES = src/ostree/main.c \
        src/ostree/ot-dump.c \
        src/ostree/ot-editor.c \
        src/ostree/ot-editor.h \
-       src/ostree/ot-tool-util.c \
-       src/ostree/ot-tool-util.h \
        $(NULL)
 
 # Admin subcommand
diff --git a/Makefile-otutil.am b/Makefile-otutil.am
index 16098e1..3a2b3dc 100644
--- a/Makefile-otutil.am
+++ b/Makefile-otutil.am
@@ -38,6 +38,8 @@ libotutil_la_SOURCES = \
        src/libotutil/ot-gio-utils.h \
        src/libotutil/otutil.c \
        src/libotutil/otutil.h \
+       src/libotutil/ot-tool-util.c \
+       src/libotutil/ot-tool-util.h \
        $(NULL)
 libotutil_la_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libglnx -I$(srcdir)/src/libotutil 
-DLOCALEDIR=\"$(datadir)/locale\" $(OT_INTERNAL_GIO_UNIX_CFLAGS)
 libotutil_la_LIBADD = $(OT_INTERNAL_GIO_UNIX_LIBS)
diff --git a/src/ostree/ot-tool-util.c b/src/libotutil/ot-tool-util.c
similarity index 97%
rename from src/ostree/ot-tool-util.c
rename to src/libotutil/ot-tool-util.c
index f4dc8f9..57e0d0c 100644
--- a/src/ostree/ot-tool-util.c
+++ b/src/libotutil/ot-tool-util.c
@@ -20,9 +20,7 @@
 
 #include "config.h"
 
-#include "ot-admin-functions.h"
 #include "otutil.h"
-#include "ostree.h"
 #include "libgsystem.h"
 #include "ot-tool-util.h"
 
diff --git a/src/ostree/ot-tool-util.h b/src/libotutil/ot-tool-util.h
similarity index 98%
rename from src/ostree/ot-tool-util.h
rename to src/libotutil/ot-tool-util.h
index db40922..74d69ce 100644
--- a/src/ostree/ot-tool-util.h
+++ b/src/libotutil/ot-tool-util.h
@@ -21,7 +21,6 @@
 #pragma once
 
 #include <gio/gio.h>
-#include <ostree.h>
 
 G_BEGIN_DECLS