Libguestfs - Dec 2019 - [common PATCH] build: stop shipping files generated by configure

They will be generated by configure.
---
 mlstdutils/Makefile.am | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mlstdutils/Makefile.am b/mlstdutils/Makefile.am
index d29255e..2b4aed8 100644
--- a/mlstdutils/Makefile.am
+++ b/mlstdutils/Makefile.am
@@ -19,9 +19,12 @@ include $(top_srcdir)/subdir-rules.mk
 
 EXTRA_DIST = \
 	$(SOURCES_MLI) \
-	$(SOURCES_ML) \
+	$(filter-out $(CONFIGURE_GENERATED_ML),$(SOURCES_ML)) \
 	std_utils_tests.ml
 
+CONFIGURE_GENERATED_ML = \
+	guestfs_config.ml
+
 SOURCES_MLI  
 if HAVE_BYTES_COMPAT_ML
@@ -41,7 +44,7 @@ SOURCES_ML += bytes.ml
 endif
 
 SOURCES_ML += \
-	guestfs_config.ml \
+	$(CONFIGURE_GENERATED_ML) \
 	stringMap.ml \
 	stringSet.ml \
 	std_utils.ml
-- 
2.23.0

On Thu, Dec 12, 2019 at 06:03:18PM +0100, Pino Toscano
wrote:
> They will be generated by configure.
> ---
>  mlstdutils/Makefile.am | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/mlstdutils/Makefile.am b/mlstdutils/Makefile.am
> index d29255e..2b4aed8 100644
> --- a/mlstdutils/Makefile.am
> +++ b/mlstdutils/Makefile.am
> @@ -19,9 +19,12 @@ include $(top_srcdir)/subdir-rules.mk
>  
>  EXTRA_DIST = \
>  	$(SOURCES_MLI) \
> -	$(SOURCES_ML) \
> +	$(filter-out $(CONFIGURE_GENERATED_ML),$(SOURCES_ML)) \
>  	std_utils_tests.ml
>  
> +CONFIGURE_GENERATED_ML = \
> +	guestfs_config.ml
> +
>  SOURCES_MLI >  
>  if HAVE_BYTES_COMPAT_ML
> @@ -41,7 +44,7 @@ SOURCES_ML += bytes.ml
>  endif
>  
>  SOURCES_ML += \
> -	guestfs_config.ml \
> +	$(CONFIGURE_GENERATED_ML) \
>  	stringMap.ml \
>  	stringSet.ml \
>  	std_utils.ml
ACK

(I guess this was broken even before the split)

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
libguestfs lets you edit virtual machines.  Supports shell scripting,
bindings from many languages.  http://libguestfs.org