[Pkg-libvirt-commits] [libguestfs] 51/179: Move JSON to mllib

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch experimental
in repository libguestfs.

commit bb0d7edfa017ed39f9a4f95b785bd50761cdb8ae
Author: Pino Toscano <ptoscano at redhat.com>
Date:   Fri Oct 10 15:10:20 2014 +0200

    Move JSON to mllib
    
    Move the simple OCaml JSON writer to mllib, so that can be enhanced and
    used also outside v2v.
---
 {v2v => mllib}/JSON.ml  | 0
 {v2v => mllib}/JSON.mli | 0
 mllib/Makefile.am       | 5 ++++-
 po/POTFILES-ml          | 2 +-
 v2v/Makefile.am         | 3 +--
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/v2v/JSON.ml b/mllib/JSON.ml
similarity index 100%
rename from v2v/JSON.ml
rename to mllib/JSON.ml
diff --git a/v2v/JSON.mli b/mllib/JSON.mli
similarity index 100%
rename from v2v/JSON.mli
rename to mllib/JSON.mli
diff --git a/mllib/Makefile.am b/mllib/Makefile.am
index ac953ac..653b8aa 100644
--- a/mllib/Makefile.am
+++ b/mllib/Makefile.am
@@ -32,6 +32,8 @@ SOURCES = \
 	fsync-c.c \
 	fsync.mli \
 	fsync.ml \
+	JSON.mli \
+	JSON.ml \
 	mkdtemp.mli \
 	mkdtemp.ml \
 	mkdtemp-c.c \
@@ -65,7 +67,8 @@ ocaml_modules = config \
 	uRI \
 	mkdtemp \
 	planner \
-	regedit
+	regedit \
+	JSON
 
 OBJECTS = \
 	$(top_builddir)/fish/guestfish-progress.o \
diff --git a/po/POTFILES-ml b/po/POTFILES-ml
index df39e7b..d919b6f 100644
--- a/po/POTFILES-ml
+++ b/po/POTFILES-ml
@@ -25,6 +25,7 @@ customize/perl_edit.ml
 customize/random_seed.ml
 customize/timezone.ml
 customize/urandom.ml
+mllib/JSON.ml
 mllib/common_gettext.ml
 mllib/common_utils.ml
 mllib/common_utils_tests.ml
@@ -83,7 +84,6 @@ sysprep/sysprep_operation_user_account.ml
 sysprep/sysprep_operation_utmp.ml
 sysprep/sysprep_operation_yum_uuid.ml
 v2v/DOM.ml
-v2v/JSON.ml
 v2v/OVF.ml
 v2v/cmdline.ml
 v2v/convert_linux.ml
diff --git a/v2v/Makefile.am b/v2v/Makefile.am
index 8bf8f07..dafe27e 100644
--- a/v2v/Makefile.am
+++ b/v2v/Makefile.am
@@ -37,7 +37,6 @@ SOURCES_MLI = \
 	input_libvirt.mli \
 	input_libvirtxml.mli \
 	input_ova.mli \
-	JSON.mli \
 	kvmuid.mli \
 	linux.mli \
 	modules_list.mli \
@@ -62,7 +61,6 @@ SOURCES_ML = \
 	xml.ml \
 	domainxml.ml \
 	DOM.ml \
-	JSON.ml \
 	kvmuid.ml \
 	vCenter.ml \
 	xen.ml \
@@ -122,6 +120,7 @@ BOBJECTS = \
 	$(top_builddir)/mllib/progress.cmo \
 	$(top_builddir)/mllib/config.cmo \
 	$(top_builddir)/mllib/mkdtemp.cmo \
+	$(top_builddir)/mllib/JSON.cmo \
 	$(top_builddir)/customize/urandom.cmo \
 	$(top_builddir)/customize/random_seed.cmo \
 	$(top_builddir)/customize/hostname.cmo \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git