Re: [PATCH] Remove explicit dependency on $(WAYLAND_LIBS)

2015-01-04 Thread Keith Packard
Peter Hutterer  writes:

> Reviewed-by: Peter Hutterer 

Merged.
   de89c6b..3573855  master -> master

-- 
-keith


signature.asc
Description: PGP signature
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel


Re: [PATCH] Remove explicit dependency on $(WAYLAND_LIBS)

2014-12-11 Thread Peter Hutterer
On Thu, Dec 11, 2014 at 07:51:27PM +0100, Olivier Fourdan wrote:
> Xwayland Makefile explicitely set its dependencies on
> WAYLAND_LIBS. If the ibrairies are installed in a non-standard
> path, WAYLAND_LIBS contains '-L/path/to/the/lib' which will fail
> at build time with:
> 
> "No rule to make target '-L/path/to/the/lib', needed by 'Xwayland'.
>  Stop"
> 
> Remove that explicit dependency to avoid the problem (LDADD ought
> to be enough to get the right libraries linked).
> 
> Signed-off-by: Olivier Fourdan 

Reviewed-by: Peter Hutterer 

Cheers,
   Peter


> ---
>  hw/xwayland/Makefile.am | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
> index 4e0e1bb..9945540 100644
> --- a/hw/xwayland/Makefile.am
> +++ b/hw/xwayland/Makefile.am
> @@ -26,7 +26,6 @@ Xwayland_LDADD =\
>   $(XWAYLAND_LIBS)\
>   $(XWAYLAND_SYS_LIBS)\
>   $(XSERVER_SYS_LIBS)
> -Xwayland_DEPENDENCIES = $(XWAYLAND_LIBS)
>  Xwayland_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
>  
>  
> -- 
> 2.1.0
> 
> ___
> xorg-de...@lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
> 
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel


[PATCH] Remove explicit dependency on $(WAYLAND_LIBS)

2014-12-11 Thread Olivier Fourdan
Xwayland Makefile explicitely set its dependencies on
WAYLAND_LIBS. If the ibrairies are installed in a non-standard
path, WAYLAND_LIBS contains '-L/path/to/the/lib' which will fail
at build time with:

"No rule to make target '-L/path/to/the/lib', needed by 'Xwayland'.
 Stop"

Remove that explicit dependency to avoid the problem (LDADD ought
to be enough to get the right libraries linked).

Signed-off-by: Olivier Fourdan 
---
 hw/xwayland/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
index 4e0e1bb..9945540 100644
--- a/hw/xwayland/Makefile.am
+++ b/hw/xwayland/Makefile.am
@@ -26,7 +26,6 @@ Xwayland_LDADD =  \
$(XWAYLAND_LIBS)\
$(XWAYLAND_SYS_LIBS)\
$(XSERVER_SYS_LIBS)
-Xwayland_DEPENDENCIES = $(XWAYLAND_LIBS)
 Xwayland_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 
 
-- 
2.1.0

___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel


Re: [PATCH] Remove explicit dependency on $(WAYLAND_LIBS)

2014-12-11 Thread Pekka Paalanen
On Wed, 03 Dec 2014 14:33:38 +0100
Olivier Fourdan  wrote:

> Hi
> 
> I was trying to build XWayland as per the recipe from 
> http://wayland.freedesktop.org/xserver.html and ran into an issue 
> because I have the Wayland libs installed in a non-standard location 
> (from http://wayland.freedesktop.org/building.html)
> 
> Basically, xserver/hw/xwayland/Makefile.am specifies 
> "Xwayland_DEPENDENCIES = $(XWAYLAND_LIBS)" which will break because 
> XWAYLAND_LIBS also contains the statements "-L/path/to/the/lib" and that 
> breaks the build with:
> 
> make[2]: *** No rule to make target '-L/path/to/the/lib', needed by 
> 'Xwayland'.  Stop.
> make[2]: Leaving directory '/home/ofourdan/src/wayland/xserver/hw/xwayland'
> 
> I am not sure why "Xwayland_DEPENDENCIES = $(XWAYLAND_LIBS)" was added 
> in the first place, it comes from a huge commit (6e539d88), but I 
> suspect it's not needed and it might be better not have it (at least it 
> builds successfully without), thus the patch attached.

Hi,

this is an Xwayland patch, and as Xwayland lives in the xserver
repository, this patch should be sent to
xorg-de...@lists.freedesktop.org

CC'ing wayland-devel@ would be nice, though.

Please, use git-send-email next time to send the patch inline. It is a
bit difficult to review as an attachment.


Thanks,
pq
___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel


[PATCH] Remove explicit dependency on $(WAYLAND_LIBS)

2014-12-03 Thread Olivier Fourdan

Hi

I was trying to build XWayland as per the recipe from 
http://wayland.freedesktop.org/xserver.html and ran into an issue 
because I have the Wayland libs installed in a non-standard location 
(from http://wayland.freedesktop.org/building.html)


Basically, xserver/hw/xwayland/Makefile.am specifies 
"Xwayland_DEPENDENCIES = $(XWAYLAND_LIBS)" which will break because 
XWAYLAND_LIBS also contains the statements "-L/path/to/the/lib" and that 
breaks the build with:


make[2]: *** No rule to make target '-L/path/to/the/lib', needed by 
'Xwayland'.  Stop.

make[2]: Leaving directory '/home/ofourdan/src/wayland/xserver/hw/xwayland'

I am not sure why "Xwayland_DEPENDENCIES = $(XWAYLAND_LIBS)" was added 
in the first place, it comes from a huge commit (6e539d88), but I 
suspect it's not needed and it might be better not have it (at least it 
builds successfully without), thus the patch attached.


HTH,
Cheers,
Olivier


>From 090928e71a4c06ee8f22cbf90b65dc4e248ee838 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan 
Date: Wed, 3 Dec 2014 13:49:37 +0100
Subject: [PATCH] Remove explicit dependency on $(WAYLAND_LIBS)

Xwayland Makefile explicitely set its dependencies on
WAYLAND_LIBS. If the ibrairies are installed in a non-standard
path, WAYLAND_LIBS contains '-L/path/to/the/lib' which will fail
at build time with:

"No rule to make target '-L/path/to/the/lib', needed by 'Xwayland'.
 Stop"

Remove that explicit dependency to avoid the problem (LDADD ought
to be enough to get the right libraries linked).

Signed-off-by: Olivier Fourdan 
---
 hw/xwayland/Makefile.am | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hw/xwayland/Makefile.am b/hw/xwayland/Makefile.am
index 4e0e1bb..9945540 100644
--- a/hw/xwayland/Makefile.am
+++ b/hw/xwayland/Makefile.am
@@ -26,7 +26,6 @@ Xwayland_LDADD =\
 	$(XWAYLAND_LIBS)			\
 	$(XWAYLAND_SYS_LIBS)			\
 	$(XSERVER_SYS_LIBS)
-Xwayland_DEPENDENCIES = $(XWAYLAND_LIBS)
 Xwayland_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 
 
-- 
2.1.0

___
wayland-devel mailing list
wayland-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/wayland-devel