util: Helper to create sets and hashes with pointer keys

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index b51dccdadfd246f5b76e7fac800dd914b4c50601..4bda54c551d960d45d5db850bd9bf142b2025fb6 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -21,9 +21,14 @@
 
 SUBDIRS = . \
        xmlpool \
+       tests/fast_idiv_by_const \
        tests/hash_table \
        tests/string_buffer \
-       tests/vma
+       tests/set
+
+if HAVE_STD_CXX11
+SUBDIRS += tests/vma
+endif
 
 include Makefile.sources
 
@@ -55,7 +60,8 @@ libmesautil_la_LIBADD = \
        $(PTHREAD_LIBS) \
        $(CLOCK_LIB) \
        $(ZLIB_LIBS) \
-       $(LIBATOMIC_LIBS)
+       $(LIBATOMIC_LIBS) \
+       -lm
 
 libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES)
 libxmlconfig_la_CFLAGS = \
@@ -63,11 +69,13 @@ libxmlconfig_la_CFLAGS = \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/src \
        -DSYSCONFDIR=\"$(sysconfdir)\" \
+       -DDATADIR=\"$(datadir)\" \
        $(VISIBILITY_CFLAGS) \
        $(EXPAT_CFLAGS)
 libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm
 
-sysconf_DATA = drirc
+drircdir = $(datadir)/drirc.d
+drirc_DATA = 00-mesa-defaults.conf
 
 u_atomic_test_LDADD = libmesautil.la
 roundeven_test_LDADD = -lm
@@ -79,7 +87,7 @@ TESTS = $(check_PROGRAMS)
 BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES)
 CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST = \
-       drirc \
+       00-mesa-defaults.conf \
        format_srgb.py \
        merge_driinfo.py \
        SConscript \
@@ -87,7 +95,7 @@ EXTRA_DIST = \
        sha1/README \
        meson.build
 
-PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
+PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
 
 format_srgb.c: format_srgb.py
        $(PYTHON_GEN) $(srcdir)/format_srgb.py > $@