Re: [Mesa-dev] [PATCH] egl_dri2: Fix out of tree builds with the wayland backend enabled

2012-05-03 Thread Sven Joachim
On 2012-05-03 02:31 +0200, Kenneth Graunke wrote:

 On 05/02/2012 04:04 PM, Robert Hooker wrote:
 Otherwise it fails like so:

CC egl_dri2.lo
 In file included from egl_dri2.h:40:0,
   from egl_dri2.c:42:
 ../../../../../../src/egl/wayland/wayland-drm/wayland-drm.h:8:41:
 fatal error: wayland-drm-server-protocol.h: No such file or directory
 compilation terminated.
 ---
   src/egl/drivers/dri2/Makefile.am |1 +
   1 file changed, 1 insertion(+)

 diff --git a/src/egl/drivers/dri2/Makefile.am 
 b/src/egl/drivers/dri2/Makefile.am
 index e4d4abb..49ec06b 100644
 --- a/src/egl/drivers/dri2/Makefile.am
 +++ b/src/egl/drivers/dri2/Makefile.am
 @@ -26,6 +26,7 @@ AM_CFLAGS = \
  -I$(top_srcdir)/src/gbm/backends/dri \
  -I$(top_srcdir)/src/egl/wayland/wayland-egl \
  -I$(top_srcdir)/src/egl/wayland/wayland-drm \
 +-I$(top_builddir)/src/egl/wayland/wayland-drm \
  $(DEFINES) \
  $(LIBDRM_CFLAGS) \
  $(LIBUDEV_CFLAGS) \

 Is $(top_srcdir)/src/egl/wayland/wayland-drm still necessary?

Apparently not.

Cheers,
   Sven
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] egl_dri2: Fix out of tree builds with the wayland backend enabled

2012-05-03 Thread Kristian Høgsberg
On Wed, May 02, 2012 at 07:04:57PM -0400, Robert Hooker wrote:
 Otherwise it fails like so:
 
   CC egl_dri2.lo
 In file included from egl_dri2.h:40:0,
  from egl_dri2.c:42:
 ../../../../../../src/egl/wayland/wayland-drm/wayland-drm.h:8:41:
 fatal error: wayland-drm-server-protocol.h: No such file or directory
 compilation terminated.

Thanks, applied.
Kristian

 ---
  src/egl/drivers/dri2/Makefile.am |1 +
  1 file changed, 1 insertion(+)
 
 diff --git a/src/egl/drivers/dri2/Makefile.am 
 b/src/egl/drivers/dri2/Makefile.am
 index e4d4abb..49ec06b 100644
 --- a/src/egl/drivers/dri2/Makefile.am
 +++ b/src/egl/drivers/dri2/Makefile.am
 @@ -26,6 +26,7 @@ AM_CFLAGS = \
   -I$(top_srcdir)/src/gbm/backends/dri \
   -I$(top_srcdir)/src/egl/wayland/wayland-egl \
   -I$(top_srcdir)/src/egl/wayland/wayland-drm \
 + -I$(top_builddir)/src/egl/wayland/wayland-drm \
   $(DEFINES) \
   $(LIBDRM_CFLAGS) \
   $(LIBUDEV_CFLAGS) \
 -- 
 1.7.9.5
 
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev


Re: [Mesa-dev] [PATCH] egl_dri2: Fix out of tree builds with the wayland backend enabled

2012-05-02 Thread Kenneth Graunke

On 05/02/2012 04:04 PM, Robert Hooker wrote:

Otherwise it fails like so:

   CC egl_dri2.lo
In file included from egl_dri2.h:40:0,
  from egl_dri2.c:42:
../../../../../../src/egl/wayland/wayland-drm/wayland-drm.h:8:41:
fatal error: wayland-drm-server-protocol.h: No such file or directory
compilation terminated.
---
  src/egl/drivers/dri2/Makefile.am |1 +
  1 file changed, 1 insertion(+)

diff --git a/src/egl/drivers/dri2/Makefile.am b/src/egl/drivers/dri2/Makefile.am
index e4d4abb..49ec06b 100644
--- a/src/egl/drivers/dri2/Makefile.am
+++ b/src/egl/drivers/dri2/Makefile.am
@@ -26,6 +26,7 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/gbm/backends/dri \
-I$(top_srcdir)/src/egl/wayland/wayland-egl \
-I$(top_srcdir)/src/egl/wayland/wayland-drm \
+   -I$(top_builddir)/src/egl/wayland/wayland-drm \
$(DEFINES) \
$(LIBDRM_CFLAGS) \
$(LIBUDEV_CFLAGS) \


Is $(top_srcdir)/src/egl/wayland/wayland-drm still necessary?

Either way,
Reviewed-by: Kenneth Graunke kenn...@whitecape.org
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev