egl/android: replace magic 0=CbCr,1=CrCb with simple enum

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

diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index 1a2273b8c3167b934e20cf5b1b8207654db4d96c..4383cca1e004c413536475a44aa829f7db4b36b0 100644 (file)
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -71,7 +71,7 @@ WL_DMABUF_XML = $(WAYLAND_PROTOCOLS_DATADIR)/unstable/linux-dmabuf/linux-dmabuf-
 
 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)
@@ -118,9 +118,7 @@ AM_CFLAGS += \
        -I$(top_srcdir)/src/egl/drivers/dri2 \
        -I$(top_srcdir)/src/gbm/backends/dri \
        -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)
@@ -137,20 +135,26 @@ libEGL_common_la_LIBADD += \
        $(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 > $@
 
@@ -202,6 +206,7 @@ endif # USE_LIBGLVND
 
 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
@@ -228,6 +233,6 @@ EXTRA_DIST = \
        drivers/haiku \
        main/egl.def \
        main/README.txt \
-       $(GLVND_GEN_DEPS) \
+       $(GLVND_GEN_EGL_DEPS) \
        main/50_mesa.json \
        meson.build