svga: update the svga3d device header files

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

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index e738ab08d2f2778c4bc78520457ce230de6c1f5f..1e087b40d38876208f4bbd8eb502d87145c31162 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -19,43 +19,45 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-SUBDIRS = . tests
+SUBDIRS = . tests/hash_table
 
 include Makefile.sources
 
-BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES)
-
-CLEANFILES = $(BUILT_SOURCES)
-
 noinst_LTLIBRARIES = libmesautil.la
 
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/include
+
 libmesautil_la_CPPFLAGS = \
        $(DEFINES) \
        -I$(top_srcdir)/include \
-       $(VISIBILITY_CFLAGS)
+       -I$(top_srcdir)/src \
+       -I$(top_srcdir)/src/mapi \
+       -I$(top_srcdir)/src/mesa \
+       -I$(top_srcdir)/src/gallium/include \
+       -I$(top_srcdir)/src/gallium/auxiliary \
+       $(SHA1_CFLAGS) \
+       $(VISIBILITY_CFLAGS) \
+       $(MSVC2008_COMPAT_CFLAGS)
 
 libmesautil_la_SOURCES = \
        $(MESA_UTIL_FILES) \
-        $(MESA_UTIL_GENERATED_FILES)
+       $(MESA_UTIL_GENERATED_FILES)
 
-format_srgb.c: $(srcdir)/format_srgb.py
-       $(AM_V_GEN) $(PYTHON2) $< > $@
+if ENABLE_SHADER_CACHE
+libmesautil_la_SOURCES += $(MESA_UTIL_SHADER_CACHE_FILES)
+
+libmesautil_la_LIBADD = $(SHA1_LIBS)
+endif
 
-### Tests:
+roundeven_test_LDADD = -lm
 
-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)
+check_PROGRAMS = u_atomic_test roundeven_test
+TESTS = $(check_PROGRAMS)
 
-TESTS = tests/ralloc_test
-check_PROGRAMS = $(TESTS)
+BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES)
+CLEANFILES = $(BUILT_SOURCES)
+EXTRA_DIST = format_srgb.py SConscript
 
-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: $(srcdir)/format_srgb.py
+       $(AM_V_GEN) $(PYTHON2) $< > $@