svga: minor whitespace fixes in svga_pipe_vertex.c

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index 1e087b40d38876208f4bbd8eb502d87145c31162..f094eb4a0d0fdc5f1a917766515a2f124d1f55a8 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -36,19 +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) \
-       $(MSVC2008_COMPAT_CFLAGS)
+       $(MSVC2013_COMPAT_CFLAGS) \
+       $(ZLIB_CFLAGS)
 
 libmesautil_la_SOURCES = \
        $(MESA_UTIL_FILES) \
        $(MESA_UTIL_GENERATED_FILES)
 
-if ENABLE_SHADER_CACHE
-libmesautil_la_SOURCES += $(MESA_UTIL_SHADER_CACHE_FILES)
-
-libmesautil_la_LIBADD = $(SHA1_LIBS)
-endif
+libmesautil_la_LIBADD = $(ZLIB_LIBS)
 
 roundeven_test_LDADD = -lm
 
@@ -57,7 +53,12 @@ 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
+
+PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
 
-format_srgb.c: $(srcdir)/format_srgb.py
-       $(AM_V_GEN) $(PYTHON2) $< > $@
+format_srgb.c: format_srgb.py
+       $(PYTHON_GEN) $(srcdir)/format_srgb.py > $@