drisw: use getImageShm() if available

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index a8352a9053e3e712d119c90464047e3e413da264..07bf052175b42dc27e54656d6ac90e6c606814da 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -19,7 +19,10 @@
 # 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/hash_table \
+       tests/string_buffer
 
 include Makefile.sources
 
@@ -28,6 +31,7 @@ noinst_LTLIBRARIES = \
        libxmlconfig.la
 
 AM_CPPFLAGS = \
+       $(PTHREAD_CFLAGS) \
        -I$(top_srcdir)/include
 
 libmesautil_la_CPPFLAGS = \
@@ -46,7 +50,11 @@ 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 = \
@@ -60,9 +68,11 @@ 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)
@@ -73,7 +83,8 @@ EXTRA_DIST = \
        merge_driinfo.py \
        SConscript \
        xmlpool.h \
-       sha1/README
+       sha1/README \
+       meson.build
 
 PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)