search for: noinst_data

...he build time. --- ocaml/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index e781363..a535b43 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -142,9 +142,9 @@ endif TESTS = run-bindtests $(test_progs_all) -noinst_DATA += bindtests.bc $(test_progs_all) +check_DATA = bindtests.bc $(test_progs_all) if HAVE_OCAMLOPT -noinst_DATA += bindtests.opt +check_DATA += bindtests.opt endif %.bc: %.cmo mlguestfs.cma @@ -204,6 +204,6 @@ install-data-hook: rm $(DESTDIR)$(OCAMLLIB)/guestfs/bindtests.* rm $(DESTDIR)$(OCAM...

...uilddir) -I$(srcdir) \ -I$(top_builddir) \ -I$(top_srcdir)/gnulib/lib -I$(top_builddir)/gnulib/lib \ diff --git a/common/mllibvirt/Makefile.am b/common/mllibvirt/Makefile.am index 12e046c35..181cb9c5c 100644 --- a/common/mllibvirt/Makefile.am +++ b/common/mllibvirt/Makefile.am @@ -59,6 +59,7 @@ noinst_DATA = $(MLLIBVIRT_CMA) libmllibvirt_a_SOURCES = $(SOURCES_C) libmllibvirt_a_CPPFLAGS = \ + -DCAML_NAME_SPACE \ -I. \ -I$(top_builddir) \ -I$(shell $(OCAMLC) -where) diff --git a/common/mlpcre/Makefile.am b/common/mlpcre/Makefile.am index 6f04256da..1e0b7795c 100644 --- a/common/mlpcre/Makefil...

...l/Makefile.am @@ -43,10 +43,20 @@ CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/ if HAVE_OCAML +DATA_HOOK_FILES = META *.so *.a *.cma \ + *.cmi $(srcdir)/*.mli +if HAVE_OCAMLOPT +DATA_HOOK_FILES += *.cmx *.cmxa +endif + OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX OCAMLOPTFLAGS = $(OCAMLCFLAGS) -noinst_DATA = mlguestfs.cma mlguestfs.cmxa META +noinst_DATA = mlguestfs.cma +if HAVE_OCAMLOPT +noinst_DATA += mlguestfs.cmxa +endif +noinst_DATA += META # Build the C part into a library, so that automake handles the C # compilation step for us. Note that we don't directly use this @@ -101,9 +111,13...

...| 8 ++++---- test-tool/Makefile.am | 4 ++-- tools/Makefile.am | 4 ++-- 20 files changed, 66 insertions(+), 65 deletions(-) diff --git a/cat/Makefile.am b/cat/Makefile.am index 6022cd6..91abfac 100644 --- a/cat/Makefile.am +++ b/cat/Makefile.am @@ -102,7 +102,7 @@ noinst_DATA = \ virt-cat.1 $(top_builddir)/html/virt-cat.1.html: stamp-virt-cat.pod stamp-virt-cat.pod: virt-cat.pod - $(top_srcdir)/podwrapper.sh \ + $(top_builddir)/podwrapper.sh \ --man virt-cat.1 \ --html $(top_builddir)/html/virt-cat.1.html \ $< @@ -111,7 +111,7 @@ stamp-virt-cat.pod: v...

...python-tests po/Makefile.in regedit/Makefile sh/Makefile diff --git a/images/Makefile.am b/images/Makefile.am index 2adaed3..e176d3c 100644 --- a/images/Makefile.am +++ b/images/Makefile.am @@ -29,7 +29,8 @@ mklarge_LDADD = ../lib/libhivex.la noinst_DATA = large -large: mklarge - ./mklarge $(srcdir)/minimal large +large: minimal mklarge + cp -u $(srcdir)/minimal $(builddir)/minimal + ./mklarge $(builddir)/minimal $(builddir)/large CLEANFILES = $(noinst_DATA) diff --git a/lib/Makefile.am b/lib/Makefile.am index d54aaee..7e5b92b 100644 --- a/lib...

...a1 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -61,7 +61,7 @@ hivex.3: hivex.pod -c "Windows Registry" \ --name "hivex" \ --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \ - $< > $@-t; mv $@-t $@ + $< > $@-t && mv $@-t $@ noinst_DATA = \ $(top_builddir)/html/hivex.3.html diff --git a/regedit/Makefile.am b/regedit/Makefile.am index 476c059..749c221 100644 --- a/regedit/Makefile.am +++ b/regedit/Makefile.am @@ -28,7 +28,7 @@ hivexregedit.1: hivexregedit -c "Windows Registry" \ --name "hivexregedit" \...

Put the "=back" to close the list only after the last element. --- regedit/hivexregedit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/regedit/hivexregedit b/regedit/hivexregedit index 02c382b..cd49063 100755 --- a/regedit/hivexregedit +++ b/regedit/hivexregedit @@ -248,8 +248,6 @@ You should only use this option for quick hacking and debugging of the hive

I believe this patch has now been superseded by Hilko's commit here: https://github.com/libguestfs/libguestfs/commit/f75142c577255b30f2a8e1d27baa5fd185594197 Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming blog: http://rwmj.wordpress.com Fedora now supports 80 OCaml packages (the OPEN alternative to F#)

...sify/Makefile.am | 18 +++++++++++++- sysprep/Makefile.am | 18 +++++++++++++- 8 files changed, 143 insertions(+), 32 deletions(-) diff --git a/builder/Makefile.am b/builder/Makefile.am index f0cb1dd..bc7ab6e 100644 --- a/builder/Makefile.am +++ b/builder/Makefile.am @@ -68,7 +68,7 @@ noinst_DATA = if HAVE_OCAML # Note this list must be in dependency order. -OBJECTS = \ +deps = \ $(top_builddir)/mllib/libdir.cmx \ $(top_builddir)/mllib/common_gettext.cmx \ $(top_builddir)/mllib/common_utils.cmx \ @@ -109,6 +109,12 @@ OBJECTS = \ cmdline.cmx \ builder.cmx +if HAVE_OCAMLOPT +O...

...b/erlang/examples/Makefile.am index 0d2a3c9..da7fc43 100644 --- a/erlang/examples/Makefile.am +++ b/erlang/examples/Makefile.am @@ -23,10 +23,6 @@ EXTRA_DIST = \ inspect_vm.erl \ guestfs-erlang.pod -CLEANFILES = \ - guestfs-erlang.3 \ - stamp-guestfs-erlang.pod - man_MANS = guestfs-erlang.3 noinst_DATA = $(top_builddir)/website/guestfs-erlang.3.html diff --git a/examples/Makefile.am b/examples/Makefile.am index 26ed938..0abc039 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -29,10 +29,6 @@ EXTRA_DIST = \ mount-local.c \ virt-dhcp-address.c -CLEANFILES = \ - guestfs-exampl...

From: Hilko Bengen <bengen at debian.org> On installations where no native OCaml compiler is available, the test program can't be compiled and so we get this message: ,---- | checking for function caml_raise_with_args... not found `---- This breaks building of the OCaml bindings. ,---- | gcc -std=gnu99 -I.. -I/usr/lib/ocaml -I../ocaml -I../lib -g -O2 -fPIC -Wall -c hivex_c.c |

...2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/common/mlstdutils/Makefile.am b/common/mlstdutils/Makefile.am index 3c1f13e18..1e96fd8f5 100644 --- a/common/mlstdutils/Makefile.am +++ b/common/mlstdutils/Makefile.am @@ -48,7 +48,12 @@ else MLSTDUTILS_CMA = mlstdutils.cmxa endif -noinst_DATA = $(MLSTDUTILS_CMA) +# Just for this library, we need to build both bytecode and native +# code because the generator always requires the bytecode version. +noinst_DATA = mlstdutils.cma +if HAVE_OCAMLOPT +noinst_DATA += mlstdutils.cmxa +endif libmlstdutils_a_SOURCES = dummy.c libmlstdutils_a_CP...

...@ -37,10 +37,25 @@ CLEANFILES += t/*.cmi t/*.cmo t/*.cmx t/*.o t/*.a t/*.so if HAVE_OCAML +DATA_HOOK_FILES = META *.so *.a *.cma \ + *.cmi $(srcdir)/*.mli +if HAVE_OCAMLOPT +DATA_HOOK_FILES += *.cmx *.cmxa +endif + OCAMLCFLAGS = -g -warn-error CDEFLMPSUVYZX OCAMLOPTFLAGS = $(OCAMLCFLAGS) -noinst_DATA = mlguestfs.cma mlguestfs.cmxa META +noinst_DATA = META +if HAVE_OCAMLOPT +noinst_DATA += mlguestfs.cma +noinst_DATA += mlguestfs.cmxa +endif + +guestfs_deps = guestfs.cmo +if HAVE_OCAMLOPT +guestfs_deps += guestfs.cmx +endif # Build the C part into a library, so that automake handles the C # c...

From: Hilko Bengen <bengen at hilluzination.de> On installations where no native OCaml compiler is available, the test program can't be compiled and so we get this message: ,---- | checking for function caml_raise_with_args... not found `---- This breaks building of the OCaml bindings. ,---- | gcc -std=gnu99 -I.. -I/usr/lib/ocaml -I../ocaml -I../lib -g -O2 -fPIC -Wall -c hivex_c.c

...2/Makefile.am > @@ -0,0 +1,46 @@ > +# nbdkit > +# Copyright (C) 2019 Red Hat Inc. and again > +# All rights reserved. Stale copy-and-paste; we got rid of these lines in 1.12. > +EXTRA_DIST = nbdkit-cat.mc > + > +if IS_WINDOWS > + > +# Build the message catalog. > +noinst_DATA = MSG00001.bin nbdkit-cat.h nbdkit-cat.rc > + > +$(noinst_DATA): nbdkit-cat.mc > + rm -f $@ > + $(MC) $< Is the message catalog integral to the general function replacements, or should this be split into a separate commit? > +++ b/common/replacements/getline.h > @@ -0,0 +1,5...

This just fixes 'make'. 'make check' is still broken. Further patches for that to follow tomorrow. Rich.

...file.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 03315de..5aa3219 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -82,7 +82,7 @@ images_files_build = \ initrd-x86_64.img.gz \ test-grep.txt.gz -noinst_DATA = $(images_files_build) test.iso +check_DATA = $(images_files_build) test.iso CLEANFILES = $(images_files_build) test.iso

...2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/common/mlstdutils/Makefile.am b/common/mlstdutils/Makefile.am index 3c1f13e18..968a03d01 100644 --- a/common/mlstdutils/Makefile.am +++ b/common/mlstdutils/Makefile.am @@ -48,7 +48,9 @@ else MLSTDUTILS_CMA = mlstdutils.cmxa endif -noinst_DATA = $(MLSTDUTILS_CMA) +# Just for this library, we need to build both bytecode and native +# code because the generator always requires the bytecode version. +noinst_DATA = mlstdutils.cma mlstdutils.cmxa libmlstdutils_a_SOURCES = dummy.c libmlstdutils_a_CPPFLAGS = \ @@ -79,8 +81,13 @@ endif li...

...> > diff --git a/common/mlstdutils/Makefile.am b/common/mlstdutils/Makefile.am > index 9e0b34d42..67441f769 100644 > --- a/common/mlstdutils/Makefile.am > +++ b/common/mlstdutils/Makefile.am > @@ -48,7 +48,9 @@ else > MLSTDUTILS_CMA = mlstdutils.cmxa > endif > > -noinst_DATA = $(MLSTDUTILS_CMA) > +# Just for this library, we need to build both bytecode and native > +# code because the generator always requires the bytecode version. > +noinst_DATA = mlstdutils.cma mlstdutils.cmxa > > libmlstdutils_a_SOURCES = dummy.c > libmlstdutils_a_CPPFLAGS = \...

...rojects. Instead we can set PKG_CONFIG_PATH to > point to server/local/nbdkit.pc which will return the correct CFLAGS. > > Fixes: commit 1ff44288ae1cf95428283e252edd9474c3fe3b55 > Thanks: Dan Berrangé, Eric Blake > --- > +++ b/plugins/golang/Makefile.am > @@ -66,18 +66,21 @@ noinst_DATA = \ > examples/dump-plugin/nbdkit-godump-plugin.so: \ > $(plugin_sources) examples/dump-plugin/dumpplugin.go > cd examples/dump-plugin && \ > + PKG_CONFIG_PATH="$(abs_builddir)/server/local$${PKG_CONFIG_PATH:-:$$PKG_CONFIG_PATH}" \ Ooops, I typod this one....