egl: Use the canonical drm-uapi fourcc header to avoid local defines.

[mesa.git] / src / egl / Makefile.am

diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 086a4a1e63020caa8c057c0fb863a4aedc5efdc7..b43805d991a4a5b7683025a794f87c62af2121c2 100644 (file)
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -27,6 +27,7 @@ BUILT_SOURCES =
 
 AM_CFLAGS = \
        -I$(top_srcdir)/include \
+       -I$(top_srcdir)/include/drm-uapi \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/egl/main \
        -I$(top_srcdir)/src/gbm/main \
@@ -80,10 +81,13 @@ drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h: $(WL_DMABUF_XML)
 if HAVE_PLATFORM_WAYLAND
 drivers/dri2/linux-dmabuf-unstable-v1-protocol.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
 drivers/dri2/egl_dri2.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
+drivers/dri2/platform_wayland.lo: drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
 
 AM_CFLAGS += $(WAYLAND_CLIENT_CFLAGS)
 libEGL_common_la_LIBADD += $(WAYLAND_CLIENT_LIBS)
 libEGL_common_la_LIBADD += $(LIBDRM_LIBS)
+AM_CFLAGS += $(WAYLAND_EGL_CFLAGS)
+libEGL_common_la_LIBADD += $(WAYLAND_EGL_LIBS)
 AM_CFLAGS += $(WAYLAND_SERVER_CFLAGS)
 libEGL_common_la_LIBADD += $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la
 libEGL_common_la_LIBADD += $(WAYLAND_SERVER_LIBS)
@@ -114,7 +118,6 @@ AM_CFLAGS += \
        -I$(top_builddir)/src/egl/drivers/dri2 \
        -I$(top_srcdir)/src/egl/drivers/dri2 \
        -I$(top_srcdir)/src/gbm/backends/dri \
-       -I$(top_srcdir)/src/egl/wayland/wayland-egl \
        -I$(top_builddir)/src/egl/wayland/wayland-drm \
        -I$(top_srcdir)/src/egl/wayland/wayland-drm \
        -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \