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 a8352a9053e3e712d119c90464047e3e413da264..4bda54c551d960d45d5db850bd9bf142b2025fb6 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -19,7 +19,16 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = xmlpool . tests/hash_table
+SUBDIRS = . \
+       xmlpool \
+       tests/fast_idiv_by_const \
+       tests/hash_table \
+       tests/string_buffer \
+       tests/set
+
+if HAVE_STD_CXX11
+SUBDIRS += tests/vma
+endif
 
 include Makefile.sources
 
@@ -28,6 +37,7 @@ noinst_LTLIBRARIES = \
        libxmlconfig.la
 
 AM_CPPFLAGS = \
+       $(PTHREAD_CFLAGS) \
        -I$(top_srcdir)/include
 
 libmesautil_la_CPPFLAGS = \
@@ -46,7 +56,12 @@ 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) \
+       -lm
 
 libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES)
 libxmlconfig_la_CFLAGS = \
@@ -54,28 +69,33 @@ 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
+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 \
+       00-mesa-defaults.conf \
        format_srgb.py \
        merge_driinfo.py \
        SConscript \
        xmlpool.h \
-       sha1/README
+       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 > $@