X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fegl%2FMakefile.am;h=4383cca1e004c413536475a44aa829f7db4b36b0;hb=0c3287e94d7e5483b31ec9a56447ac5af55d35c1;hp=bf7f87015b7f06f3a992f456f0e28c48e24b6be9;hpb=a0f6a1194464611bd93491c6d066b07db0615f27;p=mesa.git

diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index bf7f87015b7..4383cca1e00 100644
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -27,7 +27,6 @@ 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 \
@@ -119,8 +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)\"
+	-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 > $@
 
@@ -229,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