From 74ff728e095c2fbbc08bc09465aa1cb0d71c74f6 Mon Sep 17 00:00:00 2001 From: Jonathan Gray Date: Mon, 14 Aug 2017 09:58:02 +0000 Subject: Merge Mesa 17.1.6 --- lib/mesa/src/util/Makefile.am | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'lib/mesa/src/util/Makefile.am') diff --git a/lib/mesa/src/util/Makefile.am b/lib/mesa/src/util/Makefile.am index 4234f24cc..cfc2377df 100644 --- a/lib/mesa/src/util/Makefile.am +++ b/lib/mesa/src/util/Makefile.am @@ -36,15 +36,15 @@ libmesautil_la_CPPFLAGS = \ -I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/gallium/include \ -I$(top_srcdir)/src/gallium/auxiliary \ - $(SHA1_CFLAGS) \ $(VISIBILITY_CFLAGS) \ - $(MSVC2013_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 = $(ZLIB_LIBS) roundeven_test_LDADD = -lm @@ -53,7 +53,10 @@ TESTS = $(check_PROGRAMS) BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES) CLEANFILES = $(BUILT_SOURCES) -EXTRA_DIST = format_srgb.py SConscript +EXTRA_DIST = \ + format_srgb.py \ + SConscript \ + sha1/README if REGEN_SOURCES PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) -- cgit v1.2.3