similar to: [PATCH 1/2] build: factor out the OCaml link.sh scripts

Binaries should be rebuilt if mllib.cma/mllib.cmxa or customize.cma/customize.cmxa change. Fixes commit 1e2877c6f4d1d254026d38b1cac4895d8dba7d5d. --- builder/Makefile.am | 12 ++++++++++-- customize/Makefile.am | 3 ++- dib/Makefile.am | 5 ++++- get-kernel/Makefile.am | 5 ++++- mllib/Makefile.am | 15 ++++++++++++--- resize/Makefile.am | 5 ++++- sparsify/Makefile.am

Add a dummy C source, otherwise automake tries to look for e.g. common_utils_tests.c. Also, set check_PROGRAMS properly with them. --- mllib/Makefile.am | 48 +++++++++++++++++++++++++++++++++--------------- mllib/dummy.c | 2 ++ po/POTFILES | 1 + 3 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 mllib/dummy.c diff --git a/mllib/Makefile.am b/mllib/Makefile.am

Mac OS X includes crypt() in libc. --- builder/link.sh.in | 2 +- configure.ac | 9 +++++++++ customize/link.sh.in | 2 +- mllib/link.sh.in | 2 +- sysprep/link.sh.in | 2 +- v2v/link.sh.in | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/builder/link.sh.in b/builder/link.sh.in index 59f3c6f..964617f 100644 --- a/builder/link.sh.in +++

Those cleanups which only depend on libc, gnulib or libxml2 are split out into a separate common/cleanups directory. --- .gitignore | 3 +- Makefile.am | 4 +- align/Makefile.am | 2 + builder/Makefile.am | 4 + cat/Makefile.am

ocaml-link.sh is generated file. It means that for out-of-tree builds it is located in a build directory which is different from source tree dir. Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- v2v/Makefile.am | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/v2v/Makefile.am b/v2v/Makefile.am index 64703c36..1c10d07b 100644 ---

Hardcoding -ltinfo breaks on distros that do not build the sep library (which is the default ncurses behavior). Use pkg-config to look up the right libraries regardless of how the distro built things. --- builder/Makefile.am | 5 +++-- configure.ac | 18 ++++++------------ customize/Makefile.am | 2 +- mllib/Makefile.am | 6 +++--- resize/Makefile.am | 2 +-

In tools except guestfish, we don't use ncurses, or even curses, just 2 termcap functions and a global variable. These are provided by libtinfo, so just link to that. In guestfish we use readline which needs ncurses. Leave that alone. --- builder/Makefile.am | 2 +- configure.ac | 12 ++++++------ customize/Makefile.am | 2 +- mllib/Makefile.am | 6 +++---

Commit bd1c5c9f4dcf38458099db8a0bf4659a07ef055d changed all the code to use Jansson instead of yajl. However it didn't change the OCaml API name (which was still Yajl). This commit changes the module to a neutral name ("JSON_parser") and moves it into common/mltools so it can be used by other tools. This leaves us in a slightly awkward situation of having two JSON-ish OCaml

On Thu, Jan 17, Richard W.M. Jones wrote: > On Wed, Jan 16, 2013 at 05:51:53PM +0100, Olaf Hering wrote: > > On Mon, Jan 14, Olaf Hering wrote: > > > This is a first attempt to build libguestfs with just a ocaml bytecode > > > compiler. The three tools written in ocaml will be build only when an > > > ocamlopt compiler is available. > > Here is a more

Create a module ‘C_utils’ containing functions like ‘drive_name’ and ‘shell_unquote’ which come from the C utilities. The new directory ‘common/mlutils’ also contains the ‘Unix_utils’ wrappers around POSIX functions missing from the OCaml stdlib. --- .gitignore | 3 + Makefile.am | 24 ++--- builder/Makefile.am

--- .gitignore | 1 + mllib/JSON_tests.ml | 245 ++++++++++++++++++++++++++++++++++++++++++++++++++++ mllib/Makefile.am | 15 +++- po/POTFILES-ml | 1 + 4 files changed, 260 insertions(+), 2 deletions(-) create mode 100644 mllib/JSON_tests.ml diff --git a/.gitignore b/.gitignore index 4c1b90c..441cb83 100644 --- a/.gitignore +++ b/.gitignore @@ -308,6 +308,7 @@ Makefile.in

Look for libint/gettext and link to it; this properly detects whether libint is part of libc. --- align/Makefile.am | 1 + builder/Makefile.am | 2 ++ cat/Makefile.am | 4 ++++ configure.ac | 3 +++ customize/Makefile.am | 2 +- df/Makefile.am | 1 + diff/Makefile.am | 1 + edit/Makefile.am | 1 + erlang/Makefile.am

--- .gitignore | 1 + mllib/Makefile.am | 30 ++++++++- mllib/getopt_tests.ml | 68 ++++++++++++++++++++ mllib/test-getopt.sh | 168 ++++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 265 insertions(+), 2 deletions(-) create mode 100644 mllib/getopt_tests.ml create mode 100755 mllib/test-getopt.sh diff --git a/.gitignore b/.gitignore index 000e984..c1ae484

Covert common_utils_tests to use oUnit as testing framework, replacing the hand-made assert in favour of structured unit tests and better error reporting. common_utils_tests is now built only when the oUnit module has been found. --- mllib/Makefile.am | 17 ++++- mllib/common_utils_tests.ml | 155 +++++++++++++++++++++++++++----------------- 2 files changed, 108 insertions(+), 64

These won't be used by the daemon, so interferes with us using common/utils in the daemon, so they are moved to a different library. --- .gitignore | 8 +++--- Makefile.am | 4 ++- align/Makefile.am | 2 ++ align/scan.c | 1 + cat/Makefile.am | 10 ++++++++

Add a function to properly write virt-builder source index entries. Note that this function is very similar to Index.print_entry that is meant for debugging purposes. --- .gitignore | 1 + builder/Makefile.am | 36 +++++++++++++++- builder/index.mli | 3 ++ builder/index_parser.ml | 52 +++++++++++++++++++++++ builder/index_parser.mli | 6 +++

On Tue, Nov 04, 2014 at 04:35:26PM +0100, Pino Toscano wrote: > Look for libint/gettext and link to it; this properly detects whether > libint is part of libc. I'm a little confused by this patch, and also worried that it may be reverting commit 75514ab57a. Does this require gettextize? Rich. > --- > align/Makefile.am | 1 + > builder/Makefile.am | 2 ++ >

Add a function to properly write virt-builder source index entries. Note that this function is very similar to Index.print_entry that is meant for debugging purposes. --- .gitignore | 1 + builder/Makefile.am | 36 +++++++++++- builder/index.mli | 3 + builder/index_parser.ml | 54 ++++++++++++++++++ builder/index_parser.mli | 4 ++

Add a function to properly write virt-builder source index entries. Note that this function is very similar to Index.print_entry that is meant for debugging purposes. --- .gitignore | 1 + builder/Makefile.am | 36 +++++++++++- builder/index.mli | 3 + builder/index_parser.ml | 46 +++++++++++++++ builder/index_parser.mli | 4 ++

Add a function to properly write virt-builder source index entries. Note that this function is very similar to Index.print_entry that is meant for debugging purposes. --- .gitignore | 1 + builder/Makefile.am | 36 +++++++++++- builder/index.mli | 3 + builder/index_parser.ml | 54 ++++++++++++++++++ builder/index_parser.mli | 4 ++