glsl: always call do_lower_jumps() after loop unrolling

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

diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
index eaec4ff946fdd7891e7d28b1e790128aa6dc66bc..086a4a1e63020caa8c057c0fb863a4aedc5efdc7 100644 (file)
--- a/src/egl/Makefile.am
+++ b/src/egl/Makefile.am
@@ -46,11 +46,11 @@ libEGL_common_la_SOURCES = \
        $(LIBEGL_C_FILES)
 
 libEGL_common_la_LIBADD = \
-       $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
        $(top_builddir)/src/util/libmesautil.la \
        $(EGL_LIB_DEPS)
 
 dri2_backend_FILES =
+dri2_backend_GENERATED_FILES =
 dri3_backend_FILES =
 
 if HAVE_PLATFORM_X11
@@ -71,11 +71,11 @@ 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) code $< $@
 
 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
@@ -88,7 +88,8 @@ 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
@@ -119,6 +120,9 @@ AM_CFLAGS += \
        -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\" \
        -D_EGL_BUILT_IN_DRIVER_DRI2
 
+nodist_libEGL_common_la_SOURCES = \
+       $(dri2_backend_GENERATED_FILES)
+
 libEGL_common_la_SOURCES += \
        $(dri2_backend_core_FILES) \
        $(dri2_backend_FILES) \
@@ -149,7 +153,10 @@ g_egldispatchstubs.h: $(GLVND_GEN_DEPS)
                $(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 += \
@@ -165,7 +172,9 @@ libEGL_mesa_la_SOURCES = \
        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 \
@@ -177,7 +186,9 @@ else # USE_LIBGLVND
 
 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 \
@@ -216,4 +227,5 @@ EXTRA_DIST = \
        main/egl.def \
        main/README.txt \
        $(GLVND_GEN_DEPS) \
-       main/50_mesa.json
+       main/50_mesa.json \
+       meson.build