[Spice-devel] [PATCH 2/2] generator, fix Makefile.am's to build test.html

[Christophe Fergeau]

On Tue, Jul 10, 2012 at 02:37:59PM +0200, Peter Hatina wrote:
> Updated global Makefile.am and also data/Makefile.am to generate
> test.html.
> 
> ---
>  Makefile.am      |    3 ++-
>  data/Makefile.am |   13 +++++++++++--
>  2 files changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index db8e4ea..e154048 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,9 +1,10 @@
>  ACLOCAL_AMFLAGS = -I m4
>  
> -SUBDIRS = SpiceXPI data
> +SUBDIRS = SpiceXPI
>  if BUILD_GENERATOR
>  SUBDIRS += generator
>  endif
> +SUBDIRS += data
>  DIST_SUBDIRS = spice-protocol $(SUBDIRS)
>  
>  EXTRA_DIST = m4
> diff --git a/data/Makefile.am b/data/Makefile.am
> index b47e0c0..b336aca 100644
> --- a/data/Makefile.am
> +++ b/data/Makefile.am
> @@ -1,3 +1,12 @@
> -NULL =
> +if BUILD_GENERATOR
> +TEST_PAGE     	  = test.html
> +IDL           	  = $(top_srcdir)/SpiceXPI/src/plugin/nsISpicec.idl
> +GENERATOR_DIR 	  = $(top_builddir)/generator
> +GENERATOR         = $(GENERATOR_DIR)/spice-xpi-generator
> +dist_pkgdata_DATA = $(TEST_PAGE)
>  
> -EXTRA_DIST = test.html
> +all-local: $(TEST_PAGE)

I don't think you this all-local: rule since automake knows what to do with
dist_pkgdata_DATA.

> +
> +$(TEST_PAGE): $(IDL) $(GENERATOR)
> +	$(GENERATOR) -i $< -o $@

This can be prefixed with $(AM_V_GEN) to integrate better with automake
silent rules (
http://www.flameeyes.eu/autotools-mythbuster/automake/silent.html )

$(TEST_PAGE): $(IDL) $(GENERATOR)
	$(AM_V_GEN)$(GENERATOR) -i $< -o $@

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20120710/00c1239a/attachment.pgp>