[Spice-devel] [PATCH 1/4] build: slightly better parallel build

[Hans de Goede]

Hi,

On 09/23/2011 01:22 AM, Marc-André Lureau wrote:
> Following a discussion on the ML with Hans, I proposed
> this build change that make parallel build more robust.
>
> (Hans solution is not yet ready, and is more complicated)

Erm, my solution is ready, and has been ready since 2 September, but
for some reason I never send it to the list. I guess I got
distracted somehow, sorry for dropping the ball on this.

Both solutions should work about equally well. Yours is simpler, mine
has the advantage it will also work for other make targets then
"make all" and "make install", thus I slightly prefer mine, since that
has the potential to also make "make dist" work from a clean tree.

Currently make dist doesn't work in a clean tree, since it needs
generated docs, and building the docs fails if there was not
done a build first. In this since my work indeed is unfinished, but
your patch doesn't solve that either.

So let us pick a solution and merge it :)

Regards,

Hans

p.s.

I'll do a git-send-email next to send my patch to the list.



> ---
>   gtk/Makefile.am |   10 +---------
>   1 files changed, 1 insertions(+), 9 deletions(-)
>
> diff --git a/gtk/Makefile.am b/gtk/Makefile.am
> index c21af16..31e2a77 100644
> --- a/gtk/Makefile.am
> +++ b/gtk/Makefile.am
> @@ -379,9 +379,7 @@ spicy_stats_LDADD =				\
>   	libspice-client-glib-2.0.la		\
>   	$(NULL)
>
> -
> -
> -spice-channel.c: spice-marshal.h
> +BUILT_SOURCES = spice-glib-enums.h spice-widget-enums.h spice-marshal.h
>
>   spice-marshal.c: spice-marshal.txt
>   	$(AM_V_GEN)echo "#include \"spice-marshal.h\"">  $@&&  \
> @@ -418,12 +416,6 @@ spice-glib-enums.h: spice-channel.h channel-inputs.h spice-session.h
>   			--eprod "GType @enum_name at _get_type (void);\n" \
>   		$^>   $@
>
> -if HAVE_GTK_2
> -$(libspice_client_gtk_2_0_la_SOURCES): spice-glib-enums.h spice-widget-enums.h
> -else
> -$(libspice_client_gtk_3_0_la_SOURCES): spice-glib-enums.h spice-widget-enums.h
> -endif
> -
>   spice-widget-enums.c: spice-widget.h
>   	$(AM_V_GEN)glib-mkenums --fhead "#include<glib-object.h>\n" \
>   			--fhead "#include \"spice-widget-enums.h\"\n\n" \