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 2863320a480618dbff5971c5a67a61833762d9fd..1c970222c1f97a54059c8491995e819f518553ba 100644 (file)
--- a/src/gallium/state_trackers/egl/Makefile
+++ b/src/gallium/state_trackers/egl/Makefile
@@ -6,44 +6,75 @@ 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)
 common_OBJECTS = $(common_SOURCES:.c=.o)
 
-
 x11_INCLUDES = \
        -I$(TOP)/src/gallium/drivers \
-       -I$(TOP)/src/glx/x11 \
+       -I$(TOP)/src/glx \
+       -I$(TOP)/src/mapi \
        -I$(TOP)/src/mesa \
-       $(shell pkg-config --cflags-only-I libdrm)
+       $(X11_CFLAGS) \
+       $(shell pkg-config --cflags-only-I libdrm dri2proto)
 
 x11_SOURCES = $(wildcard x11/*.c) \
-             $(TOP)/src/glx/x11/dri2.c
+             $(TOP)/src/glx/dri2.c
 x11_OBJECTS = $(x11_SOURCES:.c=.o)
 
-
-kms_INCLUDES = $(shell pkg-config --cflags-only-I libdrm)
-kms_SOURCES = $(wildcard kms/*.c)
-kms_OBJECTS = $(kms_SOURCES:.c=.o)
-
-
-ALL_INCLUDES = $(common_INCLUDES) $(x11_INCLUDES) $(kms_INCLUDES)
-ALL_SOURCES = $(common_SOURCES) $(x11_SOURCES) $(kms_SOURCES)
-ALL_OBJECTS = $(common_OBJECTS) $(x11_OBJECTS) $(kms_OBJECTS)
+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)
+
+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
+fbdev_SOURCES = $(wildcard fbdev/*.c)
+fbdev_OBJECTS = $(fbdev_SOURCES:.c=.o)
+
+
+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)
+
+# add backends
+ifneq ($(findstring x11, $(EGL_PLATFORMS)),)
+EGL_OBJECTS += $(x11_OBJECTS)
+EGL_CPPFLAGS += -DHAVE_X11_BACKEND
+endif
+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)
+EGL_CPPFLAGS += -DHAVE_FBDEV_BACKEND
+endif
 
 ##### TARGETS #####
 
-EGL_DISPLAYS_MODS = $(foreach dpy, $(EGL_DISPLAYS), libegl$(dpy).a)
-
-default: depend $(EGL_DISPLAYS_MODS)
+default: depend libegl.a
 
-
-libeglx11.a: $(x11_OBJECTS) $(common_OBJECTS) Makefile
-       $(MKLIB) -o eglx11 -static $(x11_OBJECTS) $(common_OBJECTS)
-
-libeglkms.a: $(kms_OBJECTS) $(common_OBJECTS) Makefile
-       $(MKLIB) -o eglkms -static $(kms_OBJECTS) $(common_OBJECTS)
+libegl.a: $(EGL_OBJECTS) Makefile
+       $(MKLIB) -o egl -static $(EGL_OBJECTS)
 
 depend: 
        rm -f depend
@@ -51,8 +82,8 @@ depend:
        $(MKDEP) $(MKDEP_OPTIONS) $(ALL_INCLUDES) $(ALL_SOURCES) 2> /dev/null
 
 clean:
-       rm -f $(ALL_OBJECTS)
-       rm -f $(EGL_DISPLAYS_MODS)
+       rm -f libegl.a
+       rm -f $(EGL_OBJECTS)
        rm -f depend depend.bak
 
 # Dummy target
@@ -61,13 +92,23 @@ install:
 
 ##### RULES #####
 
+define egl-cc
+$(CC) -c $(common_INCLUDES) $($(1)_INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@
+endef
+
 $(common_OBJECTS): %.o: %.c
-       $(CC) -c $(common_INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@
+       $(CC) -c $(EGL_CPPFLAGS) $(DEFINES) $(CFLAGS) $< -o $@
 
 $(x11_OBJECTS): %.o: %.c
-       $(CC) -c $(common_INCLUDES) $(x11_INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@
+       $(call egl-cc,x11)
+
+$(wayland_OBJECTS): %.o: %.c
+       $(call egl-cc,wayland)
+
+$(drm_OBJECTS): %.o: %.c
+       $(call egl-cc,drm)
 
-$(kms_OBJECTS): %.o: %.c
-       $(CC) -c $(common_INCLUDES) $(kms_INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@
+$(fbdev_OBJECTS): %.o: %.c
+       $(call egl-cc,fbdev)
 
 sinclude depend