[Libguestfs] [PATCH] builder: Fix problem about index-parse.h not being generated

[Richard W.M. Jones]

On Tue, Sep 26, 2017 at 05:53:32PM +0200, Hilko Bengen wrote:
> If configured with --without-ocaml, the build might fail because the
> fix added in df5bd5741b37da9cf97d7a76ac2805557aa630db was not active.
> According to the automake documentation, it should be enough to set
> BUILT_SOURCES.
> ---
>  builder/Makefile.am | 10 +---------
>  1 file changed, 1 insertion(+), 9 deletions(-)
> 
> diff --git a/builder/Makefile.am b/builder/Makefile.am
> index e3d37667b..3c7113eee 100644
> --- a/builder/Makefile.am
> +++ b/builder/Makefile.am
> @@ -373,15 +373,7 @@ CLEANFILES += \
>  	index-parse.h \
>  	index-scan.c
>  
> -if HAVE_OCAML
> -# Automake-generated makefile has a rule ".y.c" but lacks a rule ".y.h".
> -index-parse.h: index-parse.y
> -	touch $(srcdir)/index-parse.y
> -	$(MAKE) index-parse.c
> -# Also it doesn't generate dependencies for the C files that include
> -# index-parse.h.
> -index-parser-c.c index-scan.c index-validate.c: index-parse.h
> -endif
> +BUILT_SOURCES = index-parse.h
>  
>  # Apparently there's no clean way with Automake to not have them
>  # in the distribution, so just remove them from the distdir.
> -- 
> 2.14.1

Thanks, I tested this overnight by repeatedly building the builder/
directory, and it seems to work so I have pushed this.

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
Fedora Windows cross-compiler. Compile Windows programs, test, and
build Windows installers. Over 100 libraries supported.
http://fedoraproject.org/wiki/MinGW