X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Futil%2FMakefile.am;h=4bda54c551d960d45d5db850bd9bf142b2025fb6;hb=ee23e8b17c77fa94320168427fb8a10a84b50e94;hp=1ed70c2c6eff7a9acaed1e6646ff13bba13d5c96;hpb=1e0da6233be6e5fb0143615d5e3d3642ddb7964f;p=mesa.git

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 1ed70c2c6ef..4bda54c551d 100644
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -19,35 +19,83 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = . tests
+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
 
-noinst_LTLIBRARIES = libmesautil.la
+noinst_LTLIBRARIES = \
+	libmesautil.la \
+	libxmlconfig.la
+
+AM_CPPFLAGS = \
+	$(PTHREAD_CFLAGS) \
+	-I$(top_srcdir)/include
 
 libmesautil_la_CPPFLAGS = \
 	$(DEFINES) \
 	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/src/mesa \
-	$(VISIBILITY_CFLAGS)
+	-I$(top_srcdir)/src/gallium/include \
+	-I$(top_srcdir)/src/gallium/auxiliary \
+	$(VISIBILITY_CFLAGS) \
+	$(MSVC2013_COMPAT_CFLAGS) \
+	$(ZLIB_CFLAGS)
+
+libmesautil_la_SOURCES = \
+	$(MESA_UTIL_FILES) \
+	$(MESA_UTIL_GENERATED_FILES)
+
+libmesautil_la_LIBADD = \
+	$(PTHREAD_LIBS) \
+	$(CLOCK_LIB) \
+	$(ZLIB_LIBS) \
+	$(LIBATOMIC_LIBS) \
+	-lm
+
+libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES)
+libxmlconfig_la_CFLAGS = \
+	$(DEFINES) \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/src \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DDATADIR=\"$(datadir)\" \
+	$(VISIBILITY_CFLAGS) \
+	$(EXPAT_CFLAGS)
+libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm
+
+drircdir = $(datadir)/drirc.d
+drirc_DATA = 00-mesa-defaults.conf
 
-libmesautil_la_SOURCES = $(MESA_UTIL_FILES)
+u_atomic_test_LDADD = libmesautil.la
+roundeven_test_LDADD = -lm
+mesa_sha1_test_LDADD = libmesautil.la
 
-### Tests:
+check_PROGRAMS = u_atomic_test roundeven_test mesa-sha1_test
+TESTS = $(check_PROGRAMS)
 
-CFLAGS_FOR_TESTS = $(PTHREAD_CFLAGS)
-CPPFLAGS_FOR_TESTS = \
-	$(libmesautil_la_CPPFLAGS) \
-	-I$(top_srcdir)/src/gtest/include
-LDADD_FOR_TESTS =                               \
-	$(top_builddir)/src/gtest/libgtest.la   \
-	$(top_builddir)/src/util/libmesautil.la \
-	$(PTHREAD_LIBS)
+BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES)
+CLEANFILES = $(BUILT_SOURCES)
+EXTRA_DIST = \
+	00-mesa-defaults.conf \
+	format_srgb.py \
+	merge_driinfo.py \
+	SConscript \
+	xmlpool.h \
+	sha1/README \
+	meson.build
 
-TESTS = tests/ralloc_test
-check_PROGRAMS = $(TESTS)
+PYTHON_GEN = $(AM_V_GEN)$(PYTHON) $(PYTHON_FLAGS)
 
-tests_ralloc_test_SOURCES = tests/ralloc_test.cpp
-tests_ralloc_test_CFLAGS = $(CFLAGS_FOR_TESTS)
-tests_ralloc_test_CPPFLAGS = $(CPPFLAGS_FOR_TESTS)
-tests_ralloc_test_LDADD = $(LDADD_FOR_TESTS)
+format_srgb.c: format_srgb.py
+	$(PYTHON_GEN) $(srcdir)/format_srgb.py > $@