Mostly just code motion, but common_gettext.mli was the same whether
or not ocaml-gettext exists, so instead of generating it, add the file
to git.
---
.gitignore | 4 +-
Makefile.am | 1 +
builder/Makefile.am | 3 ++
common/mlgettext/Makefile.am | 86 +++++++++++++++++++++++++++++++++++++
common/mlgettext/common_gettext.mli | 59 +++++++++++++++++++++++++
common/mlgettext/dummy.c | 2 +
configure.ac | 1 +
customize/Makefile.am | 3 ++
dib/Makefile.am | 3 ++
docs/C_SOURCE_FILES | 1 +
docs/guestfs-hacking.pod | 5 +++
get-kernel/Makefile.am | 3 ++
m4/guestfs-ocaml-gettext.m4 | 56 ------------------------
m4/guestfs_ocaml.m4 | 12 +++---
mllib/Makefile.am | 8 +++-
ocaml-dep.sh.in | 1 +
po/POTFILES | 1 +
po/POTFILES-ml | 1 -
resize/Makefile.am | 3 ++
sparsify/Makefile.am | 3 ++
sysprep/Makefile.am | 3 ++
v2v/Makefile.am | 4 ++
22 files changed, 195 insertions(+), 68 deletions(-)
diff --git a/.gitignore b/.gitignore
index de82ec835..3ffa7302f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,6 +124,8 @@ Makefile.in
/common/errnostring/errnostring.h
/common/miniexpect/miniexpect.3
/common/mlaugeas/.depend
+/common/mlgettext/.depend
+/common/mlgettext/common_gettext.ml
/common/mlpcre/.depend
/common/mlpcre/pcre_tests
/common/mlprogress/.depend
@@ -378,8 +380,6 @@ Makefile.in
/make-fs/virt-make-fs.1
/missing
/mllib/.depend
-/mllib/common_gettext.ml
-/mllib/common_gettext.mli
/mllib/common_utils_tests
/mllib/getopt_tests
/mllib/JSON_tests
diff --git a/Makefile.am b/Makefile.am
index 10a2c8ae2..eac2288e7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,6 +158,7 @@ SUBDIRS += csharp
# OCaml tools. Note 'common/ml*', 'mllib' and 'customize'
contain
# shared code used by other OCaml tools, so these must come first.
if HAVE_OCAML
+SUBDIRS += common/mlgettext
SUBDIRS += common/mlprogress
SUBDIRS += common/mlvisit
SUBDIRS += common/mlxml
diff --git a/builder/Makefile.am b/builder/Makefile.am
index e3d37667b..2acc6022f 100644
--- a/builder/Makefile.am
+++ b/builder/Makefile.am
@@ -128,6 +128,7 @@ OCAMLPACKAGES = \
-I $(top_builddir)/ocaml \
-I $(top_builddir)/common/mlstdutils \
-I $(top_builddir)/common/mlutils \
+ -I $(top_builddir)/common/mlgettext \
-I $(top_builddir)/common/mlpcre \
-I $(top_builddir)/mllib \
-I $(top_builddir)/customize
@@ -159,6 +160,7 @@ OBJECTS = $(XOBJECTS)
endif
OCAMLLINKFLAGS = \
+ mlgettext.$(MLARCHIVE) \
mlpcre.$(MLARCHIVE) \
mlstdutils.$(MLARCHIVE) \
mlguestfs.$(MLARCHIVE) \
@@ -170,6 +172,7 @@ OCAMLLINKFLAGS = \
virt_builder_DEPENDENCIES = \
$(OBJECTS) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \
+ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlstdutils/mlstdutils.$(MLARCHIVE) \
../common/mlutils/mlcutils.$(MLARCHIVE) \
../mllib/mllib.$(MLARCHIVE) \
diff --git a/common/mlgettext/Makefile.am b/common/mlgettext/Makefile.am
new file mode 100644
index 000000000..0b232fb55
--- /dev/null
+++ b/common/mlgettext/Makefile.am
@@ -0,0 +1,86 @@
+# Wrapper around ocaml-gettext.
+# Copyright (C) 2009-2017 Red Hat Inc.
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+include $(top_srcdir)/subdir-rules.mk
+
+EXTRA_DIST = \
+ $(SOURCES_MLI) \
+ $(SOURCES_ML)
+
+SOURCES_MLI = \
+ common_gettext.mli
+
+SOURCES_ML = \
+ common_gettext.ml
+
+if HAVE_OCAML
+
+# We pretend that we're building a C library. automake handles the
+# compilation of the C sources for us. At the end we take the C
+# objects and OCaml objects and link them into the OCaml library.
+# This C library is never used.
+
+noinst_LIBRARIES = libmlgettext.a
+
+if !HAVE_OCAMLOPT
+MLGETTEXT_CMA = mlgettext.cma
+else
+MLGETTEXT_CMA = mlgettext.cmxa
+endif
+
+noinst_DATA = $(MLGETTEXT_CMA)
+
+libmlgettext_a_SOURCES = dummy.c
+libmlgettext_a_CPPFLAGS = \
+ -I. \
+ -I$(top_builddir)
+libmlgettext_a_CFLAGS = \
+ $(WARN_CFLAGS) $(WERROR_CFLAGS) \
+ -fPIC
+
+BOBJECTS = $(SOURCES_ML:.ml=.cmo)
+XOBJECTS = $(BOBJECTS:.cmo=.cmx)
+
+OCAMLPACKAGES = -I $(builddir)
+if HAVE_OCAML_PKG_GETTEXT
+OCAMLPACKAGES += -package gettext-stub
+endif
+
+OCAMLFLAGS = $(OCAML_FLAGS) $(OCAML_WARN_ERROR)
+
+if !HAVE_OCAMLOPT
+OBJECTS = $(BOBJECTS)
+else
+OBJECTS = $(XOBJECTS)
+endif
+
+libmlgettext_a_DEPENDENCIES = $(OBJECTS)
+
+mlgettext.cma: $(BOBJECTS)
+ $(OCAMLFIND) ocamlc $(OCAMLPACKAGES) -a $^ -o $@
+
+if HAVE_OCAMLOPT
+mlgettext.cmxa: $(XOBJECTS)
+ $(OCAMLFIND) ocamlopt $(OCAMLPACKAGES) -a $^ -o $@
+endif
+
+# Dependencies.
+.depend: *.mli *.ml
+ $(top_builddir)/ocaml-dep.sh $^
+-include .depend
+
+endif
diff --git a/common/mlgettext/common_gettext.mli b/common/mlgettext/common_gettext.mli
new file mode 100644
index 000000000..d333458ce
--- /dev/null
+++ b/common/mlgettext/common_gettext.mli
@@ -0,0 +1,59 @@
+(* Wrapper around ocaml-gettext.
+ * Copyright (C) 2009-2017 Red Hat Inc.
+ *
+ * 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
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *)
+
+(** Gettext functions for OCaml virt tools.
+
+ The Common_gettext module provides gettext functions, or dummy
+ functions if ocaml-gettext was not available at configure time.
+
+ {b Note}: Don't translate debug strings, or strings which are
+ meant to be read/written only by machine.
+
+ There are two ways to translate constant strings in OCaml programs.
+
+ For ordinary strings, replace ["string"] with [s_"string"].
Since
+ this is a function call to a function called [s_], you may have
+ to put parentheses around the expression.
+
+ For format strings, use:
+
+{v
+ printf (f_"zeroing filesystem %s") filename;
+v}
+
+ Note for format strings, the parentheses are almost always required,
+ and they just go around the [(f_"string")], {i not} around the other
+ arguments of the printf function.
+
+ At build time, a program parses the OCaml code into an abstract
+ syntax tree and statically determines all calls to the special
+ [s_] and [f_] functions, which means: (a) You can be very loose
+ with syntax, unlike ordinary xgettext, but (b) you cannot rename
+ these functions.
+*)
+
+module Gettext : sig
+ val s_ : string -> string
+ val f_ :
+ ('a, 'b, 'c, 'c, 'c, 'd) format6 -> ('a, 'b,
'c, 'c, 'c, 'd) format6
+ val sn_ : string -> string -> int -> string
+ val fn_ :
+ ('a, 'b, 'c, 'c, 'c, 'd) format6 ->
+ ('a, 'b, 'c, 'c, 'c, 'd) format6 ->
+ int -> ('a, 'b, 'c, 'c, 'c, 'd) format6
+end
diff --git a/common/mlgettext/dummy.c b/common/mlgettext/dummy.c
new file mode 100644
index 000000000..ebab6198c
--- /dev/null
+++ b/common/mlgettext/dummy.c
@@ -0,0 +1,2 @@
+/* Dummy source, to be used for OCaml-based tools with no C sources. */
+enum { foo = 1 };
diff --git a/configure.ac b/configure.ac
index 1ab54500d..f1deadde9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -227,6 +227,7 @@ AC_CONFIG_FILES([Makefile
common/edit/Makefile
common/miniexpect/Makefile
common/mlaugeas/Makefile
+ common/mlgettext/Makefile
common/mlpcre/Makefile
common/mlprogress/Makefile
common/mlstdutils/Makefile
diff --git a/customize/Makefile.am b/customize/Makefile.am
index ff2c2e2d0..b3edc2e9b 100644
--- a/customize/Makefile.am
+++ b/customize/Makefile.am
@@ -126,6 +126,7 @@ OCAMLPACKAGES = \
-I $(top_builddir)/ocaml \
-I $(top_builddir)/common/mlstdutils \
-I $(top_builddir)/common/mlutils \
+ -I $(top_builddir)/common/mlgettext \
-I $(top_builddir)/common/mlpcre \
-I $(top_builddir)/mllib \
-I $(builddir)
@@ -156,6 +157,7 @@ endif
OCAMLLINKFLAGS = \
mlstdutils.$(MLARCHIVE) \
mlguestfs.$(MLARCHIVE) \
+ mlgettext.$(MLARCHIVE) \
mlpcre.$(MLARCHIVE) \
mlcutils.$(MLARCHIVE) \
mllib.$(MLARCHIVE) \
@@ -178,6 +180,7 @@ virt_customize_DEPENDENCIES = \
$(CUSTOMIZE_THEOBJECTS) \
$(CUSTOMIZE_CMA) \
../common/mlutils/mlcutils.$(MLARCHIVE) \
+ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \
../mllib/mllib.$(MLARCHIVE)
virt_customize_LINK = \
diff --git a/dib/Makefile.am b/dib/Makefile.am
index fda074b45..37fa3224b 100644
--- a/dib/Makefile.am
+++ b/dib/Makefile.am
@@ -85,6 +85,7 @@ OCAMLPACKAGES = \
-I $(top_builddir)/ocaml \
-I $(top_builddir)/common/mlstdutils \
-I $(top_builddir)/common/mlutils \
+ -I $(top_builddir)/common/mlgettext \
-I $(top_builddir)/common/mlpcre \
-I $(top_builddir)/mllib
if HAVE_OCAML_PKG_GETTEXT
@@ -110,6 +111,7 @@ OCAMLLINKFLAGS = \
mlstdutils.$(MLARCHIVE) \
mlguestfs.$(MLARCHIVE) \
mlcutils.$(MLARCHIVE) \
+ mlgettext.$(MLARCHIVE) \
mlpcre.$(MLARCHIVE) \
mllib.$(MLARCHIVE) \
$(LINK_CUSTOM_OCAMLC_ONLY)
@@ -118,6 +120,7 @@ virt_dib_DEPENDENCIES = \
$(OBJECTS) \
../common/mlstdutils/mlstdutils.$(MLARCHIVE) \
../common/mlutils/mlcutils.$(MLARCHIVE) \
+ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \
../mllib/mllib.$(MLARCHIVE) \
$(top_srcdir)/ocaml-link.sh
diff --git a/docs/C_SOURCE_FILES b/docs/C_SOURCE_FILES
index 2b947a81c..9ef9b0257 100644
--- a/docs/C_SOURCE_FILES
+++ b/docs/C_SOURCE_FILES
@@ -16,6 +16,7 @@ common/edit/file-edit.h
common/miniexpect/miniexpect.c
common/miniexpect/miniexpect.h
common/mlaugeas/augeas-c.c
+common/mlgettext/dummy.c
common/mlpcre/dummy.c
common/mlpcre/pcre-c.c
common/mlprogress/progress-c.c
diff --git a/docs/guestfs-hacking.pod b/docs/guestfs-hacking.pod
index d0a28b094..56982d2c8 100644
--- a/docs/guestfs-hacking.pod
+++ b/docs/guestfs-hacking.pod
@@ -105,6 +105,11 @@ in virt-p2v.
Bindings for the Augeas library. These come from the ocaml-augeas
library
L<http://git.annexia.org/?p=ocaml-augeas.git>
+=item F<common/mlgettext>
+
+Small, generated wrapper which allows libguestfs to be compiled with
+or without ocaml-gettext. This is generated by F<./configure>.
+
=item F<common/mlpcre>
Lightweight OCaml bindings for Perl Compatible Regular Expressions
diff --git a/get-kernel/Makefile.am b/get-kernel/Makefile.am
index f833f35f4..dad96bbe2 100644
--- a/get-kernel/Makefile.am
+++ b/get-kernel/Makefile.am
@@ -68,6 +68,7 @@ OCAMLPACKAGES = \
-I $(top_builddir)/ocaml \
-I $(top_builddir)/common/mlstdutils \
-I $(top_builddir)/common/mlutils \
+ -I $(top_builddir)/common/mlgettext \
-I $(top_builddir)/common/mlpcre \
-I $(top_builddir)/mllib
if HAVE_OCAML_PKG_GETTEXT
@@ -92,6 +93,7 @@ endif
OCAMLLINKFLAGS = \
mlstdutils.$(MLARCHIVE) \
mlguestfs.$(MLARCHIVE) \
+ mlgettext.$(MLARCHIVE) \
mlpcre.$(MLARCHIVE) \
mlcutils.$(MLARCHIVE) \
mllib.$(MLARCHIVE) \
@@ -101,6 +103,7 @@ virt_get_kernel_DEPENDENCIES = \
$(OBJECTS) \
../common/mlstdutils/mlstdutils.$(MLARCHIVE) \
../common/mlutils/mlcutils.$(MLARCHIVE) \
+ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \
../mllib/mllib.$(MLARCHIVE) \
$(top_srcdir)/ocaml-link.sh
diff --git a/m4/guestfs-ocaml-gettext.m4 b/m4/guestfs-ocaml-gettext.m4
index a95a062dd..ebb203226 100644
--- a/m4/guestfs-ocaml-gettext.m4
+++ b/m4/guestfs-ocaml-gettext.m4
@@ -62,59 +62,3 @@ EOF
chmod -w $1
])
-
-AC_DEFUN([GUESTFS_CREATE_COMMON_GETTEXT_MLI],[
- dnl Check for ocaml-gettext package to translate OCaml tools.
- AC_CHECK_OCAML_PKG(gettext)
-
- AC_MSG_NOTICE([creating $1])
- rm -f $1
-
- cat <<EOF > $1
-(* This file is generated automatically by ./configure. *)
-
-(** Gettext functions for OCaml virt tools.
-
- The Common_gettext module provides gettext functions, or dummy
- functions if ocaml-gettext was not available at configure time.
-
- {b Note}: Don't translate debug strings, or strings which are
- meant to be read/written only by machine.
-
- There are two ways to translate constant strings in OCaml programs.
-
- For ordinary strings, replace [["string"]] with [[s_"string"]].
Since
- this is a function call to a function called [[s_]], you may have
- to put parentheses around the expression.
-
- For format strings, use:
-
-{v
- printf (f_"zeroing filesystem %s") filename;
-v}
-
- Note for format strings, the parentheses are almost always required,
- and they just go around the [[(f_"string")]], {i not} around the other
- arguments of the printf function.
-
- At build time, a program parses the OCaml code into an abstract
- syntax tree and statically determines all calls to the special
- [[s_]] and [[f_]] functions, which means: (a) You can be very loose
- with syntax, unlike ordinary xgettext, but (b) you cannot rename
- these functions.
-*)
-
-module Gettext : sig
- val s_ : string -> string
- val f_ :
- ('a, 'b, 'c, 'c, 'c, 'd) format6 -> ('a, 'b,
'c, 'c, 'c, 'd) format6
- val sn_ : string -> string -> int -> string
- val fn_ :
- ('a, 'b, 'c, 'c, 'c, 'd) format6 ->
- ('a, 'b, 'c, 'c, 'c, 'd) format6 ->
- int -> ('a, 'b, 'c, 'c, 'c, 'd) format6
-end
-EOF
-
- chmod -w $1
-])
diff --git a/m4/guestfs_ocaml.m4 b/m4/guestfs_ocaml.m4
index bb4cfb070..f3d470929 100644
--- a/m4/guestfs_ocaml.m4
+++ b/m4/guestfs_ocaml.m4
@@ -90,15 +90,13 @@ OCAML_PKG_oUnit=no
ounit_is_v2=no
have_Bytes_module=no
AS_IF([test "x$OCAMLC" != "xno"],[
- # Create mllib/common_gettext.ml and mllib/commit_gettext.mli,
- # gettext functions or stubs.
+ # Create common/mlgettext/common_gettext.ml gettext functions or stubs.
- # If we're building in a different directory, then mllib/ might
- # not exist yet, so create it:
- mkdir -p mllib
+ # If we're building in a different directory, then common/mlgettext
+ # might not exist yet, so create it:
+ mkdir -p common/mlgettext
- GUESTFS_CREATE_COMMON_GETTEXT_ML([mllib/common_gettext.ml])
- GUESTFS_CREATE_COMMON_GETTEXT_MLI([mllib/common_gettext.mli])
+ GUESTFS_CREATE_COMMON_GETTEXT_ML([common/mlgettext/common_gettext.ml])
AC_CHECK_OCAML_PKG(libvirt)
AC_CHECK_OCAML_PKG(oUnit)
diff --git a/mllib/Makefile.am b/mllib/Makefile.am
index 3f2af3c61..f9f23c669 100644
--- a/mllib/Makefile.am
+++ b/mllib/Makefile.am
@@ -28,7 +28,6 @@ EXTRA_DIST = \
SOURCES_MLI = \
checksums.mli \
- common_gettext.mli \
common_utils.mli \
curl.mli \
getopt.mli \
@@ -40,7 +39,6 @@ SOURCES_MLI = \
xpath_helpers.mli
SOURCES_ML = \
- common_gettext.ml \
getopt.ml \
common_utils.ml \
URI.ml \
@@ -86,6 +84,7 @@ libmllib_a_CPPFLAGS = \
-I$(top_srcdir)/common/utils \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/common/options \
+ -I$(top_srcdir)/common/mlgettext \
-I$(top_srcdir)/common/mlpcre \
-I$(top_srcdir)/common/mlxml \
-I$(top_srcdir)/common/mlstdutils \
@@ -107,6 +106,7 @@ OCAMLPACKAGES = \
-I $(top_builddir)/lib/.libs \
-I $(top_builddir)/gnulib/lib/.libs \
-I $(top_builddir)/ocaml \
+ -I $(top_builddir)/common/mlgettext \
-I $(top_builddir)/common/mlpcre \
-I $(top_builddir)/common/mlxml \
-I $(top_builddir)/common/mlstdutils \
@@ -191,6 +191,7 @@ endif
OCAMLLINKFLAGS = \
mlstdutils.$(MLARCHIVE) \
mlcutils.$(MLARCHIVE) \
+ mlgettext.$(MLARCHIVE) \
mlpcre.$(MLARCHIVE) \
mlguestfs.$(MLARCHIVE) \
$(LINK_CUSTOM_OCAMLC_ONLY)
@@ -198,6 +199,7 @@ OCAMLLINKFLAGS = \
common_utils_tests_DEPENDENCIES = \
$(common_utils_tests_THEOBJECTS) \
../common/mlstdutils/mlstdutils.$(MLARCHIVE) \
+ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \
$(MLLIB_CMA) \
$(top_srcdir)/ocaml-link.sh
@@ -210,6 +212,7 @@ common_utils_tests_LINK = \
getopt_tests_DEPENDENCIES = \
$(getopt_tests_THEOBJECTS) \
../common/mlstdutils/mlstdutils.$(MLARCHIVE) \
+ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \
$(MLLIB_CMA) \
$(top_srcdir)/ocaml-link.sh
@@ -222,6 +225,7 @@ getopt_tests_LINK = \
JSON_tests_DEPENDENCIES = \
$(JSON_tests_THEOBJECTS) \
../common/mlstdutils/mlstdutils.$(MLARCHIVE) \
+ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \
$(MLLIB_CMA) \
$(top_srcdir)/ocaml-link.sh
diff --git a/ocaml-dep.sh.in b/ocaml-dep.sh.in
index a8c501cf8..1bea4da72 100755
--- a/ocaml-dep.sh.in
+++ b/ocaml-dep.sh.in
@@ -34,6 +34,7 @@ set -e
# dependencies don't get built right.
include_dirs="
common/mlaugeas
+common/mlgettext
common/mlpcre
common/mlprogress
common/mlstdutils
diff --git a/po/POTFILES b/po/POTFILES
index 7d58151b3..c8a36a247 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -17,6 +17,7 @@ common/errnostring/errnostring-gperf.c
common/errnostring/errnostring.c
common/miniexpect/miniexpect.c
common/mlaugeas/augeas-c.c
+common/mlgettext/dummy.c
common/mlpcre/dummy.c
common/mlpcre/pcre-c.c
common/mlprogress/progress-c.c
diff --git a/po/POTFILES-ml b/po/POTFILES-ml
index 9b8752915..f4cb5f154 100644
--- a/po/POTFILES-ml
+++ b/po/POTFILES-ml
@@ -48,7 +48,6 @@ mllib/JSON.ml
mllib/JSON_tests.ml
mllib/URI.ml
mllib/checksums.ml
-mllib/common_gettext.ml
mllib/common_utils.ml
mllib/common_utils_tests.ml
mllib/curl.ml
diff --git a/resize/Makefile.am b/resize/Makefile.am
index 035bfb9fe..2dd33c797 100644
--- a/resize/Makefile.am
+++ b/resize/Makefile.am
@@ -65,6 +65,7 @@ OCAMLPACKAGES = \
-I $(top_builddir)/common/mlstdutils \
-I $(top_builddir)/common/mlprogress \
-I $(top_builddir)/common/mlutils \
+ -I $(top_builddir)/common/mlgettext \
-I $(top_builddir)/common/mlpcre \
-I $(top_builddir)/mllib
if HAVE_OCAML_PKG_GETTEXT
@@ -91,6 +92,7 @@ OCAMLLINKFLAGS = \
mlstdutils.$(MLARCHIVE) \
mlguestfs.$(MLARCHIVE) \
mlprogress.$(MLARCHIVE) \
+ mlgettext.$(MLARCHIVE) \
mlpcre.$(MLARCHIVE) \
mlcutils.$(MLARCHIVE) \
mllib.$(MLARCHIVE) \
@@ -100,6 +102,7 @@ virt_resize_DEPENDENCIES = \
$(OBJECTS) \
../common/mlstdutils/mlstdutils.$(MLARCHIVE) \
../common/mlutils/mlcutils.$(MLARCHIVE) \
+ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \
../mllib/mllib.$(MLARCHIVE) \
$(top_srcdir)/ocaml-link.sh
diff --git a/sparsify/Makefile.am b/sparsify/Makefile.am
index 427d35670..d8efc4bc2 100644
--- a/sparsify/Makefile.am
+++ b/sparsify/Makefile.am
@@ -73,6 +73,7 @@ OCAMLPACKAGES = \
-I $(top_builddir)/common/mlstdutils \
-I $(top_builddir)/common/mlprogress \
-I $(top_builddir)/common/mlutils \
+ -I $(top_builddir)/common/mlgettext \
-I $(top_builddir)/common/mlpcre \
-I $(top_builddir)/mllib
if HAVE_OCAML_PKG_GETTEXT
@@ -99,6 +100,7 @@ OCAMLLINKFLAGS = \
mlstdutils.$(MLARCHIVE) \
mlguestfs.$(MLARCHIVE) \
mlprogress.$(MLARCHIVE) \
+ mlgettext.$(MLARCHIVE) \
mlpcre.$(MLARCHIVE) \
mlcutils.$(MLARCHIVE) \
mllib.$(MLARCHIVE) \
@@ -108,6 +110,7 @@ virt_sparsify_DEPENDENCIES = \
$(OBJECTS) \
../common/mlstdutils/mlstdutils.$(MLARCHIVE) \
../common/mlutils/mlcutils.$(MLARCHIVE) \
+ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \
../mllib/mllib.$(MLARCHIVE) \
$(top_srcdir)/ocaml-link.sh
diff --git a/sysprep/Makefile.am b/sysprep/Makefile.am
index c1aca2966..778c36c8b 100644
--- a/sysprep/Makefile.am
+++ b/sysprep/Makefile.am
@@ -117,6 +117,7 @@ OCAMLPACKAGES = \
-I $(top_builddir)/common/visit/.libs \
-I $(top_builddir)/common/mlstdutils \
-I $(top_builddir)/common/mlutils \
+ -I $(top_builddir)/common/mlgettext \
-I $(top_builddir)/common/mlpcre \
-I $(top_builddir)/common/mlvisit \
-I $(top_builddir)/mllib \
@@ -146,6 +147,7 @@ endif
OCAMLLINKFLAGS = \
mlstdutils.$(MLARCHIVE) \
mlguestfs.$(MLARCHIVE) \
+ mlgettext.$(MLARCHIVE) \
mlpcre.$(MLARCHIVE) \
mlcutils.$(MLARCHIVE) \
mllib.$(MLARCHIVE) \
@@ -157,6 +159,7 @@ virt_sysprep_DEPENDENCIES = \
$(OBJECTS) \
../common/mlstdutils/mlstdutils.$(MLARCHIVE) \
../common/mlutils/mlcutils.$(MLARCHIVE) \
+ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \
../mllib/mllib.$(MLARCHIVE) \
../customize/customize.$(MLARCHIVE) \
diff --git a/v2v/Makefile.am b/v2v/Makefile.am
index 3a38b3a98..b7148e2c2 100644
--- a/v2v/Makefile.am
+++ b/v2v/Makefile.am
@@ -151,6 +151,7 @@ OCAMLPACKAGES = \
-I $(top_builddir)/ocaml \
-I $(top_builddir)/common/mlstdutils \
-I $(top_builddir)/common/mlutils \
+ -I $(top_builddir)/common/mlgettext \
-I $(top_builddir)/common/mlpcre \
-I $(top_builddir)/common/mlxml \
-I $(top_builddir)/mllib \
@@ -178,6 +179,7 @@ endif
OCAMLLINKFLAGS = \
mlstdutils.$(MLARCHIVE) \
mlguestfs.$(MLARCHIVE) \
+ mlgettext.$(MLARCHIVE) \
mlpcre.$(MLARCHIVE) \
mlxml.$(MLARCHIVE) \
mlcutils.$(MLARCHIVE) \
@@ -220,6 +222,7 @@ virt_v2v_copy_to_local_DEPENDENCIES = \
$(COPY_TO_LOCAL_OBJECTS) \
../common/mlstdutils/mlstdutils.$(MLARCHIVE) \
../common/mlxml/mlxml.$(MLARCHIVE) \
+ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \
../common/mlutils/mlcutils.$(MLARCHIVE) \
../mllib/mllib.$(MLARCHIVE) \
@@ -511,6 +514,7 @@ v2v_unit_tests_DEPENDENCIES = \
$(v2v_unit_tests_THEOBJECTS) \
../common/mlstdutils/mlstdutils.$(MLARCHIVE) \
../common/mlxml/mlxml.$(MLARCHIVE) \
+ ../common/mlgettext/mlgettext.$(MLARCHIVE) \
../common/mlpcre/mlpcre.$(MLARCHIVE) \
../common/mlutils/mlcutils.$(MLARCHIVE) \
../mllib/mllib.$(MLARCHIVE) \
--
2.13.2