Re: [spice-server] build: Use <> rather than "" for including spice-server-enums.h

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



> 
> On Wed, Aug 08, 2018 at 04:19:53PM +0200, Christophe Fergeau wrote:
> > On Wed, Aug 08, 2018 at 07:13:28AM -0400, Frediano Ziglio wrote:
> > > > 
> > > > When using #include "spice-server-enums.h", it will be looked up first
> > > > in the directory containing the file being build, which is going to be
> > > > $srcdir when dcc.c includes it. However, spice-server-enums.h is a
> > > > generated file, so it will be in $builddir, not in $srcdir. This most
> > > > of
> > > > the time won't be causing any problems, except when you happen to have
> > > > an invalid spice-server-enums.h in $srcdir and you are doing an
> > > > out-of-tree build.
> > > > Using #include <spice-server-enums.h> instead allows the correct
> > > > spice-server-enums.h file to be looked up.
> > > > 
> > > > Signed-off-by: Christophe Fergeau <cfergeau@xxxxxxxxxx>
> > > > ---
> > > >  server/dcc.c | 2 +-
> > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > > 
> > > > diff --git a/server/dcc.c b/server/dcc.c
> > > > index 0468e7213..826dd28fe 100644
> > > > --- a/server/dcc.c
> > > > +++ b/server/dcc.c
> > > > @@ -24,7 +24,7 @@
> > > >  #include "display-channel-private.h"
> > > >  #include "red-client.h"
> > > >  #include "main-channel-client.h"
> > > > -#include "spice-server-enums.h"
> > > > +#include <spice-server-enums.h>
> > > 
> > > Maybe can be <server/spice-server-enums.h> ?
> > > (didn't try, should be checked with both autoconf and meson).
> > 
> > Yup, <server/spice-server-enums.h> works too.
> 
> I pushed this commit after changing that, and this is causing
> some issues with building from tarballs :-/
> spice-server-enums.[ch] are shipped in tarballs, so in such build, it's
> desirable to bee looking for the .h file in $srcdir. I guess we can just
> revert this patch... No time for that now, I'll take a closer look
> tomorrow.
> 
> Christophe
> 

All CI tests are passing removing the "server/", see
https://gitlab.freedesktop.org/freddy77/spice/pipelines/3083

Frediano
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel




[Index of Archives]     [Linux Virtualization]     [Linux Virtualization]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]     [Monitors]