Merge branch 'xa_branch'

[mesa.git] / src / gallium / state_trackers / egl / Makefile

diff --git a/src/gallium/state_trackers/egl/Makefile b/src/gallium/state_trackers/egl/Makefile
index 9e9e479e7e0a1484a60986c2cdff8f4b702b10c1..1c970222c1f97a54059c8491995e819f518553ba 100644 (file)
--- a/src/gallium/state_trackers/egl/Makefile
+++ b/src/gallium/state_trackers/egl/Makefile
@@ -6,6 +6,7 @@ common_INCLUDES = \
        -I$(TOP)/src/gallium/include \
        -I$(TOP)/src/gallium/auxiliary \
        -I$(TOP)/src/egl/main \
+       -I$(TOP)/src/egl/wayland/wayland-drm/ \
        -I$(TOP)/include
 
 common_SOURCES = $(wildcard common/*.c)
@@ -17,16 +18,25 @@ x11_INCLUDES = \
        -I$(TOP)/src/mapi \
        -I$(TOP)/src/mesa \
        $(X11_CFLAGS) \
-       $(shell pkg-config --cflags-only-I libdrm)
+       $(shell pkg-config --cflags-only-I libdrm dri2proto)
 
 x11_SOURCES = $(wildcard x11/*.c) \
              $(TOP)/src/glx/dri2.c
 x11_OBJECTS = $(x11_SOURCES:.c=.o)
 
+wayland_INCLUDES = \
+       -I$(TOP)/src/gallium/winsys \
+       -I$(TOP)/src/egl/wayland/wayland-egl \
+       -I$(TOP)/src/egl/wayland/wayland-drm \
+       $(shell pkg-config --cflags-only-I libdrm wayland-client)
 
-kms_INCLUDES = $(shell pkg-config --cflags-only-I libdrm)
-kms_SOURCES = $(wildcard kms/*.c)
-kms_OBJECTS = $(kms_SOURCES:.c=.o)
+wayland_SOURCES = $(wildcard wayland/*.c)
+wayland_OBJECTS = $(wayland_SOURCES:.c=.o)
+
+drm_INCLUDES = -I$(TOP)/src/gallium/winsys $(shell pkg-config --cflags-only-I libdrm) \
+              -I$(TOP)/src/gbm/main -I$(TOP)/src/gallium/state_trackers/gbm
+drm_SOURCES = $(wildcard drm/*.c)
+drm_OBJECTS = $(drm_SOURCES:.c=.o)
 
 
 fbdev_INCLUDES = -I$(TOP)/src/gallium/winsys/sw
@@ -34,8 +44,8 @@ fbdev_SOURCES = $(wildcard fbdev/*.c)
 fbdev_OBJECTS = $(fbdev_SOURCES:.c=.o)
 
 
-ALL_INCLUDES = $(common_INCLUDES) $(x11_INCLUDES) $(kms_INCLUDES) $(fbdev_INCLUDES)
-ALL_SOURCES = $(common_SOURCES) $(x11_SOURCES) $(kms_SOURCES) $(fbdev_SOURCES)
+ALL_INCLUDES = $(common_INCLUDES) $(x11_INCLUDES) $(drm_INCLUDES) $(fbdev_INCLUDES)
+ALL_SOURCES = $(common_SOURCES) $(x11_SOURCES) $(drm_SOURCES) $(fbdev_SOURCES)
 
 EGL_OBJECTS = $(common_OBJECTS)
 EGL_CPPFLAGS = $(common_INCLUDES)
@@ -45,9 +55,14 @@ ifneq ($(findstring x11, $(EGL_PLATFORMS)),)
 EGL_OBJECTS += $(x11_OBJECTS)
 EGL_CPPFLAGS += -DHAVE_X11_BACKEND
 endif
-ifneq ($(findstring kms, $(EGL_PLATFORMS)),)
-EGL_OBJECTS += $(kms_OBJECTS)
-EGL_CPPFLAGS += -DHAVE_KMS_BACKEND
+ifneq ($(findstring wayland, $(EGL_PLATFORMS)),)
+EGL_OBJECTS += $(wayland_OBJECTS)
+EGL_CPPFLAGS += -DHAVE_WAYLAND_BACKEND
+DEFINES += -DHAVE_WAYLAND_BACKEND
+endif
+ifneq ($(findstring drm, $(EGL_PLATFORMS)),)
+EGL_OBJECTS += $(drm_OBJECTS)
+EGL_CPPFLAGS += -DHAVE_DRM_BACKEND
 endif
 ifneq ($(findstring fbdev, $(EGL_PLATFORMS)),)
 EGL_OBJECTS += $(fbdev_OBJECTS)
@@ -87,8 +102,11 @@ $(common_OBJECTS): %.o: %.c
 $(x11_OBJECTS): %.o: %.c
        $(call egl-cc,x11)
 
-$(kms_OBJECTS): %.o: %.c
-       $(call egl-cc,kms)
+$(wayland_OBJECTS): %.o: %.c
+       $(call egl-cc,wayland)
+
+$(drm_OBJECTS): %.o: %.c
+       $(call egl-cc,drm)
 
 $(fbdev_OBJECTS): %.o: %.c
        $(call egl-cc,fbdev)