nir: make nir_instrs_equal() static

[mesa.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 874a3334a83af31db072312fa58a22ba8952bc74..9e15cca5ea4a3c9dde9a73e437a30de90cb9b8e1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,8 +19,6 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 SUBDIRS = . gtest util mapi/glapi/gen mapi
 
 if NEED_OPENGL_COMMON
@@ -37,23 +35,20 @@ if HAVE_EGL_PLATFORM_WAYLAND
 SUBDIRS += egl/wayland/wayland-egl egl/wayland/wayland-drm
 endif
 
-if HAVE_EGL_DRIVER_DRI2
-SUBDIRS += egl/drivers/dri2
-endif
-
 if HAVE_GBM
 SUBDIRS += gbm
 endif
 
 if HAVE_EGL
-SUBDIRS += egl/main
+SUBDIRS += egl
 endif
 
 if HAVE_GALLIUM
 SUBDIRS += gallium
 endif
 
-EXTRA_DIST = egl/docs getopt hgl SConscript
+EXTRA_DIST = \
+       getopt hgl SConscript
 
 AM_CFLAGS = $(VISIBILITY_CFLAGS)
 AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
@@ -67,6 +62,8 @@ AM_CPPFLAGS = \
 noinst_LTLIBRARIES = libglsl_util.la
 
 libglsl_util_la_SOURCES = \
+       glsl/shader_enums.c \
        mesa/main/imports.c \
        mesa/program/prog_hash_table.c \
-       mesa/program/symbol_table.c
+       mesa/program/symbol_table.c \
+       mesa/program/dummy_errors.c