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

[Christophe Fergeau]

On Tue, Jul 10, 2012 at 10:27:51AM +0200, Peter Hatina wrote:
> Added some rules to make test.html by the generator.
> 
> Peter Hatina
> EMEA ENG-Desktop Development
> Red Hat Czech, Brno
> 
> ---
>  data/Makefile.am |   17 +++++++++++++++--
>  1 file changed, 15 insertions(+), 2 deletions(-)
> 
> diff --git a/data/Makefile.am b/data/Makefile.am
> index b47e0c0..cf2687b 100644
> --- a/data/Makefile.am
> +++ b/data/Makefile.am
> @@ -1,3 +1,16 @@
> -NULL =
> +if BUILD_GENERATOR
> +TEST_PAGE     = test.html
> +IDL           = $(top_srcdir)/SpiceXPI/src/plugin/nsISpicec.idl
> +GENERATOR_DIR = $(top_srcdir)/generator
> +GENERATOR     = $(GENERATOR_DIR)/spice-xpi-generator

The built generator will end up in $(top_builddir)/generator

> +CLEAN_FILES   = $(TEST_PAGE)
> +EXTRA_DIST    = $(TEST_PAGE)
>  
> -EXTRA_DIST = test.html
> +all: $(TEST_PAGE)

Maybe these can be combined in a
dist_pkgdata_DATA = $(TEST_PAGE) rule? this has the side-effect of
installing the test page though, which probably makes sense.
At the very least, all: should be all-local: according to
http://www.gnu.org/software/automake/manual/html_node/Extending.html

> +
> +$(GENERATOR):
> +	make -C $(GENERATOR_DIR)

Is this rule necessary? I'd expect the $(GENERATOR) dependency below to get the
generator to build if needed.

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/05d8e975/attachment.pgp>