[Mesa-dev] [PATCH] Fix build for gbm having wayland

[Kristian Høgsberg]

On Tue, Jul 17, 2012 at 08:14:32PM +0900, Elvis Lee wrote:
> gbm: backends/dri/gbm_dri.c fails to find wayland-drm-server-protocol.h
> because egl/wayland is not built before gbm.

I just pushed a different fix to include a copy of the format enums in
wayland-drm.h instead and not try to include the generated files
across directories.

Thanks,
Kristian

> Signed-off-by: Elvis Lee <kwangwoong.lee at lge.com>
> ---
>  src/gbm/Makefile.am |    3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am
> index 5ca2839..8f56873 100644
> --- a/src/gbm/Makefile.am
> +++ b/src/gbm/Makefile.am
> @@ -22,6 +22,7 @@ libgbm_la_LIBADD = $(LIBUDEV_LIBS) $(DLOPEN_LIBS)
>  
>  if HAVE_EGL_PLATFORM_WAYLAND
>  AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM
> +BUILT_SOURCES = wayland-drm-server-protocol.h
>  endif
>  
>  if HAVE_DRI
> @@ -42,3 +43,5 @@ endif
>  all-local: libgbm.la
>  	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
>  	ln -f .libs/libgbm.so.1.0.0 $(top_builddir)/$(LIB_DIR)/libgbm.so
> +wayland-drm-server-protocol.h : ../egl/wayland/wayland-drm/Makefile
> +	$(MAKE) -C ../egl/wayland/wayland-drm/ wayland-drm-server-protocol.h
> -- 
> 1.7.9.5
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev