drirc: Group a few games in the glthread whitelist together.

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index e05a2c5958ca4c703feea66f768ea9d2962f8e11..b57da3cd94859ec24e0b95cc07fc8554ede8b6b9 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -19,11 +19,16 @@
 # 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
 
 include Makefile.sources
 
-noinst_LTLIBRARIES = libmesautil.la
+noinst_LTLIBRARIES = \
+       libmesautil.la \
+       libxmlconfig.la
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/include
@@ -36,16 +41,32 @@ libmesautil_la_CPPFLAGS = \
        -I$(top_srcdir)/src/mesa \
        -I$(top_srcdir)/src/gallium/include \
        -I$(top_srcdir)/src/gallium/auxiliary \
-       $(SHA1_CFLAGS) \
        $(VISIBILITY_CFLAGS) \
-       $(MSVC2008_COMPAT_CFLAGS)
+       $(MSVC2013_COMPAT_CFLAGS) \
+       $(ZLIB_CFLAGS)
 
 libmesautil_la_SOURCES = \
        $(MESA_UTIL_FILES) \
        $(MESA_UTIL_GENERATED_FILES)
 
-libmesautil_la_LIBADD = $(SHA1_LIBS)
+libmesautil_la_LIBADD = \
+       $(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
 
 check_PROGRAMS = u_atomic_test roundeven_test
@@ -53,7 +74,13 @@ TESTS = $(check_PROGRAMS)
 
 BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES)
 CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = format_srgb.py SConscript
+EXTRA_DIST = \
+       drirc \
+       format_srgb.py \
+       merge_driinfo.py \
+       SConscript \
+       xmlpool.h \
+       sha1/README
 
 PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)