util: add allow_glsl_builtin_const_expression to drirc for Google Earth VR

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index f094eb4a0d0fdc5f1a917766515a2f124d1f55a8..65794338c5b886c65b76e7269bee2479b33d099b 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -19,13 +19,23 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = . tests/hash_table
+SUBDIRS = . \
+       xmlpool \
+       tests/hash_table \
+       tests/string_buffer
+
+if HAVE_STD_CXX11
+SUBDIRS += tests/vma
+endif
 
 include Makefile.sources
 
-noinst_LTLIBRARIES = libmesautil.la
+noinst_LTLIBRARIES = \
+       libmesautil.la \
+       libxmlconfig.la
 
 AM_CPPFLAGS = \
+       $(PTHREAD_CFLAGS) \
        -I$(top_srcdir)/include
 
 libmesautil_la_CPPFLAGS = \
@@ -44,19 +54,41 @@ libmesautil_la_SOURCES = \
        $(MESA_UTIL_FILES) \
        $(MESA_UTIL_GENERATED_FILES)
 
-libmesautil_la_LIBADD = $(ZLIB_LIBS)
+libmesautil_la_LIBADD = \
+       $(PTHREAD_LIBS) \
+       $(CLOCK_LIB) \
+       $(ZLIB_LIBS) \
+       $(LIBATOMIC_LIBS)
+
+libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES)
+libxmlconfig_la_CFLAGS = \
+       $(DEFINES) \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src \
+       -DSYSCONFDIR=\"$(sysconfdir)\" \
+       $(VISIBILITY_CFLAGS) \
+       $(EXPAT_CFLAGS)
+libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm
+
+sysconf_DATA = drirc
 
+u_atomic_test_LDADD = libmesautil.la
 roundeven_test_LDADD = -lm
+mesa_sha1_test_LDADD = libmesautil.la
 
-check_PROGRAMS = u_atomic_test roundeven_test
+check_PROGRAMS = u_atomic_test roundeven_test mesa-sha1_test
 TESTS = $(check_PROGRAMS)
 
 BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES)
 CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST = \
+       drirc \
        format_srgb.py \
+       merge_driinfo.py \
        SConscript \
-       sha1/README
+       xmlpool.h \
+       sha1/README \
+       meson.build
 
 PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)