nir: Replace fmin(b2f(a), b) with a bcsel

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

diff --git a/src/compiler/Makefile.am b/src/compiler/Makefile.am
index fd1dd4b6d305d181e7ccf708ed4abeff86a43747..fd6811ff26ef81076c5ee71160a63380b82f3f2b 100644 (file)
--- a/src/compiler/Makefile.am
+++ b/src/compiler/Makefile.am
@@ -1,4 +1,5 @@
 #
+# Copyright © 2012 Jon TURNEY
 # Copyright (C) 2015 Intel Corporation
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
@@ -27,12 +28,21 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/src \
        -I$(top_srcdir)/src/mapi \
        -I$(top_srcdir)/src/mesa/ \
+       -I$(top_builddir)/src/compiler/glsl\
+       -I$(top_srcdir)/src/compiler/glsl\
+       -I$(top_srcdir)/src/compiler/glsl/glcpp\
+       -I$(top_builddir)/src/compiler/nir \
+       -I$(top_srcdir)/src/compiler/nir \
+       -I$(top_srcdir)/src/compiler/spirv \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
+       -I$(top_srcdir)/src/gtest/include \
+       $(VALGRIND_CFLAGS) \
        $(DEFINES)
 
 AM_CFLAGS = \
        $(VISIBILITY_CFLAGS) \
+       $(WNO_OVERRIDE_INIT) \
        $(MSVC2013_COMPAT_CFLAGS)
 
 AM_CXXFLAGS = \
@@ -43,4 +53,21 @@ noinst_LTLIBRARIES = libcompiler.la
 
 libcompiler_la_SOURCES = $(LIBCOMPILER_FILES)
 
-EXTRA_DIST = SConscript
+check_PROGRAMS =
+TESTS =
+BUILT_SOURCES =
+CLEANFILES =
+EXTRA_DIST = \
+       SConscript \
+       glsl/glcpp/meson.build \
+       glsl/tests/meson.build \
+       glsl/meson.build \
+       nir/meson.build \
+       meson.build
+
+MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
+PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
+
+include Makefile.glsl.am
+
+include Makefile.nir.am