Re: [Libguestfs] [PATCH 1/6] out-of-tree build: fix documentation generation
On Sun, Aug 14, 2011 at 10:58:08AM +0200, Hilko Bengen wrote:
[...]
20 files changed, 66 insertions(+), 65 deletions(-)
Thanks for this.
Patches 2 and 3 seem very brutal. Isn't there a better way than
recursively copying everything into the build directory?
I have applied the other patches (1, 4, 5, 6). I'm just doing a bit
of testing, but will push them after. I only care about the
srcdir == builddir case so I'm happy as long as that doesn't break.
I have a few comments about patch 1 below.
-stamp-guestfs-recipes.pod: guestfs-recipes.pod create_disk.c
inspect_vm.c
- $(top_srcdir)/podwrapper.sh \
+stamp-guestfs-recipes.pod: $(builddir)/guestfs-recipes.pod create_disk.c inspect_vm.c
+ $(top_builddir)/podwrapper.sh \
This change appears to be wrong. guestfs-recipes.pod is be a source
file, isn't it?
The two *.c files are not actually used here. That appears to be a
copy and paste error which I will push a fix for separately.
stamp-guestfish.pod: guestfish.pod guestfish-actions.pod
guestfish-commands.pod
Should these 3 files be source files? They come from the generator,
which is creating files in $srcdir as discussed in the earlier email.
stamp-virt-inspector.pod: virt-inspector.pod
Also $(srcdir)/...?
stamp-guestfs-java.pod: guestfs-java.pod CreateDisk.java
InspectVM.java
Ditto?
stamp-guestfs-ocaml.pod: guestfs-ocaml.pod create_disk.ml
inspect_vm.ml
Ditto?
stamp-guestfs-perl.pod: guestfs-perl.pod create_disk.pl
inspect_vm.pl
Ditto?
guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod
guestfs-structs.pod
Ditto?
guestfish.1: guestfish.pod guestfish-actions.pod
guestfish-commands.pod
Ditto?
> diff --git a/po-docs/uk/Makefile.am b/po-docs/uk/Makefile.am
> index 4b149fe..07778b5 100644
> --- a/po-docs/uk/Makefile.am
> +++ b/po-docs/uk/Makefile.am
> @@ -52,26 +52,26 @@ EXTRA_DIST = \
> all-local: $(MANPAGES)
>
guestfs.3: guestfs.pod guestfs-actions.pod guestfs-availability.pod
guestfs-structs.pod
Ditto?
Also all po-docs/??/Makefile.am files should be identical. They are,
so that's good:
$ md5sum po-docs/??/Makefile.am
6adfd54f347c4d0e5fd8496545f8b49f po-docs/ja/Makefile.am
6adfd54f347c4d0e5fd8496545f8b49f po-docs/uk/Makefile.am
stamp-guestfs-python.pod: guestfs-python.pod create_disk.py
inspect_vm.py
Ditto?
stamp-guestfs-ruby.pod: guestfs-ruby.pod create_disk.rb
inspect_vm.rb
Ditto?
-libguestfs-test-tool.1: libguestfs-test-tool.pod
- $(top_srcdir)/podwrapper.sh \
+libguestfs-test-tool.1: $(builddir)/libguestfs-test-tool.pod
+ $(top_builddir)/podwrapper.sh \
--man $@ \
$<
libguestfs-test-tool.pod should be a source file?
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
virt-p2v converts physical machines to virtual machines. Boot with a
live CD or over the network (PXE) and turn machines into Xen guests.
http://et.redhat.com/~rjones/virt-p2v