[Spice-devel,spice-common] Makefile.am: fix .gitignore not being generated in spice-protocol/spice

Submitted by Alon Levy on June 14, 2012, 11:17 a.m.

Details

Message ID 1339672630-6841-1-git-send-email-alevy@redhat.com
State Accepted
Commit 9dff18a399fe07f5c53b0ba65715f0d58a60c6a0
Headers show

Not browsing as part of any series.

Commit Message

Alon Levy June 14, 2012, 11:17 a.m.
By adding spice-protocol to SUBDIRS configure and make will be called in it.

Spotted by Marc-André.
---
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/Makefile.am b/Makefile.am
index 28450b4..3b3c88d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@ 
 NULL =
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = python_modules common
+SUBDIRS = python_modules common spice-protocol
 DIST_SUBDIRS = spice-protocol $(SUBDIRS)
 
 EXTRA_DIST =				\

Comments

----- Mensaje original -----
> By adding spice-protocol to SUBDIRS configure and make will be called
> in it.
> 
> Spotted by Marc-André.
> ---
>  Makefile.am |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile.am b/Makefile.am
> index 28450b4..3b3c88d 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -1,7 +1,7 @@
>  NULL =
>  ACLOCAL_AMFLAGS = -I m4
>  
> -SUBDIRS = python_modules common
> +SUBDIRS = python_modules common spice-protocol
>  DIST_SUBDIRS = spice-protocol $(SUBDIRS)

Can you check make distcheck? I wonder why I used DIST_SUBDIRS in the first place.
On Thu, Jun 14, 2012 at 08:28:24AM -0400, Marc-André Lureau wrote:
> 
> 
> ----- Mensaje original -----
> > By adding spice-protocol to SUBDIRS configure and make will be called
> > in it.
> >
> > Spotted by Marc-André.
> > ---
> >  Makefile.am |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/Makefile.am b/Makefile.am
> > index 28450b4..3b3c88d 100644
> > --- a/Makefile.am
> > +++ b/Makefile.am
> > @@ -1,7 +1,7 @@
> >  NULL =
> >  ACLOCAL_AMFLAGS = -I m4
> >
> > -SUBDIRS = python_modules common
> > +SUBDIRS = python_modules common spice-protocol
> >  DIST_SUBDIRS = spice-protocol $(SUBDIRS)
> 
> Can you check make distcheck? I wonder why I used DIST_SUBDIRS in the first place.
> 

broke it already with spice-protocol/spice/enums.h, thanks for pointing
it out.
Hey,

On Thu, Jun 14, 2012 at 02:17:10PM +0300, Alon Levy wrote:
> By adding spice-protocol to SUBDIRS configure and make will be called in it.

This patch has an unfortunate side-effect, it's that it causes
spice-protocol headers to be installed. In particular, this means
running make install in spice-gtk will install spice-protocol headers,
which is not what we want imo.

Christophe