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 53a273e4cd4310950dddcca7a71cdd782b1a1f86..f094eb4a0d0fdc5f1a917766515a2f124d1f55a8 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -25,21 +25,40 @@ include Makefile.sources
 
 noinst_LTLIBRARIES = libmesautil.la
 
+AM_CPPFLAGS = \
+       -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 = $(ZLIB_LIBS)
+
+roundeven_test_LDADD = -lm
+
+check_PROGRAMS = u_atomic_test roundeven_test
+TESTS = $(check_PROGRAMS)
+
 BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES)
 CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST = format_srgb.py
+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 > $@