AM_CFLAGS = \
-I$(top_srcdir)/include \
+ -I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/egl/main \
-I$(top_srcdir)/src/gbm/main \
-I$(top_srcdir)/src \
$(EGL_LIB_DEPS)
dri2_backend_FILES =
+dri2_backend_GENERATED_FILES =
dri3_backend_FILES =
if HAVE_PLATFORM_X11
drivers/dri2/linux-dmabuf-unstable-v1-protocol.c: $(WL_DMABUF_XML)
$(MKDIR_GEN)
- $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@
+ $(AM_V_GEN)$(WAYLAND_SCANNER) $(SCANNER_ARG) $< $@
drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h: $(WL_DMABUF_XML)
$(MKDIR_GEN)
- $(AM_V_GEN)$(WAYLAND_SCANNER) client-header < $< > $@
+ $(AM_V_GEN)$(WAYLAND_SCANNER) client-header $< $@
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_CFLAGS)
-libEGL_common_la_LIBADD += $(WAYLAND_LIBS)
+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)
dri2_backend_FILES += \
- drivers/dri2/platform_wayland.c \
+ drivers/dri2/platform_wayland.c
+dri2_backend_GENERATED_FILES += \
drivers/dri2/linux-dmabuf-unstable-v1-protocol.c \
drivers/dri2/linux-dmabuf-unstable-v1-client-protocol.h
endif
-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)\" \
- -D_EGL_BUILT_IN_DRIVER_DRI2
+ -I$(top_srcdir)/src/egl/wayland/wayland-drm
+
+nodist_libEGL_common_la_SOURCES = \
+ $(dri2_backend_GENERATED_FILES)
libEGL_common_la_SOURCES += \
$(dri2_backend_core_FILES) \
$(LIBDRM_LIBS) \
$(CLOCK_LIB)
-GLVND_GEN_DEPS = generate/gen_egl_dispatch.py \
- generate/egl.xml generate/eglFunctionList.py generate/genCommon.py \
+# dummy rule to keep dist happy
+$(top_scrdir)/src/mapi/new/genCommon.py:
+
+GLVND_GEN_EGL_DEPS = \
+ generate/gen_egl_dispatch.py \
+ generate/eglFunctionList.py \
+ generate/egl.xml \
generate/egl_other.xml
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
+GLVND_GEN_DEPS = $(top_scrdir)/src/mapi/new/genCommon.py \
+ $(GLVND_GEN_EGL_DEPS)
+
+PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
g_egldispatchstubs.c: $(GLVND_GEN_DEPS)
$(PYTHON_GEN) $(top_srcdir)/src/egl/generate/gen_egl_dispatch.py source \
- $(top_srcdir)/src/egl/generate/eglFunctionList.py \
$(top_srcdir)/src/egl/generate/egl.xml \
$(top_srcdir)/src/egl/generate/egl_other.xml > $@
g_egldispatchstubs.h: $(GLVND_GEN_DEPS)
$(PYTHON_GEN) $(top_srcdir)/src/egl/generate/gen_egl_dispatch.py header \
- $(top_srcdir)/src/egl/generate/eglFunctionList.py \
$(top_srcdir)/src/egl/generate/egl.xml \
$(top_srcdir)/src/egl/generate/egl_other.xml > $@
BUILT_SOURCES += g_egldispatchstubs.c g_egldispatchstubs.h
-CLEANFILES = $(BUILT_SOURCES)
+
+CLEANFILES = \
+ $(BUILT_SOURCES) \
+ $(dri2_backend_GENERATED_FILES)
if USE_LIBGLVND
AM_CFLAGS += \
main/egldispatchstubs.c \
g_egldispatchstubs.c \
g_egldispatchstubs.h
-libEGL_mesa_la_LIBADD = libEGL_common.la
+libEGL_mesa_la_LIBADD = \
+ libEGL_common.la \
+ $(top_builddir)/src/mapi/shared-glapi/libglapi.la
libEGL_mesa_la_LDFLAGS = \
-no-undefined \
-version-number 0 \
lib_LTLIBRARIES = libEGL.la
libEGL_la_SOURCES =
-libEGL_la_LIBADD = libEGL_common.la
+libEGL_la_LIBADD = \
+ libEGL_common.la \
+ $(top_builddir)/src/mapi/shared-glapi/libglapi.la
libEGL_la_LDFLAGS = \
-no-undefined \
-version-number 1:0 \
include $(top_srcdir)/install-lib-links.mk
+# TODO: When building with glvnd, glvnd itself should be providing egl.pc and the headers
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = main/egl.pc
$(top_srcdir)/include/EGL/eglmesaext.h \
$(top_srcdir)/include/EGL/eglplatform.h
-TESTS = egl-symbols-check \
- egl-entrypoint-check
+TESTS = egl-entrypoint-check
+
+if USE_LIBGLVND
+#TODO: glvnd symbol check
+else
+TESTS += egl-symbols-check
+endif
EXTRA_DIST = \
$(TESTS) \
drivers/haiku \
main/egl.def \
main/README.txt \
- $(GLVND_GEN_DEPS) \
- main/50_mesa.json
+ $(GLVND_GEN_EGL_DEPS) \
+ main/50_mesa.json \
+ meson.build