4 files changed, 25 insertions, 31 deletions
diff --git a/src/gallium/state_trackers/xvmc/Makefile.am b/src/gallium/state_trackers/xvmc/Makefile.am
index b3b2e2f4ad3..973ac5dfa18 100644
--- a/src/gallium/state_trackers/xvmc/Makefile.am
+++ b/src/gallium/state_trackers/xvmc/Makefile.am
@@ -35,6 +35,29 @@ libxvmctracker_la_SOURCES = \
 	subpicture.c \
 	attributes.c
 
+check_PROGRAMS = \
+	tests/test_context \
+	tests/test_surface \
+	tests/test_subpicture \
+	tests/test_blocks \
+	tests/test_rendering
+TESTS = $(check_PROGRAMS)
+noinst_PROGRAMS = tests/xvmc_bench
+
+TEST_LIBS = -lXvMCW -lXvMC -lXv -lX11
+tests_test_context_SOURCES = tests/test_context.c tests/testlib.c
+tests_test_context_LDADD = $(TEST_LIBS)
+tests_test_surface_SOURCES = tests/test_surface.c tests/testlib.c
+tests_test_surface_LDADD = $(TEST_LIBS)
+tests_test_subpicture_SOURCES = tests/test_subpicture.c tests/testlib.c
+tests_test_subpicture_LDADD = $(TEST_LIBS)
+tests_test_blocks_SOURCES = tests/test_blocks.c tests/testlib.c
+tests_test_blocks_LDADD = $(TEST_LIBS)
+tests_test_rendering_SOURCES = tests/test_rendering.c tests/testlib.c
+tests_test_rendering_LDADD = $(TEST_LIBS)
+tests_xvmc_bench_SOURCES = tests/xvmc_bench.c tests/testlib.c
+tests_xvmc_bench_LDADD = $(TEST_LIBS)
+
 #XXX: Delete this when all targets that rely on xvmctracker are converted to automake.
 all-local: libxvmctracker.la
 	ln -f $(builddir)/.libs/libxvmctracker.a $(builddir)/libxvmctracker.a
diff --git a/src/gallium/state_trackers/xvmc/tests/Makefile b/src/gallium/state_trackers/xvmc/tests/Makefile
deleted file mode 100644
index fa19045ba72..00000000000
--- a/src/gallium/state_trackers/xvmc/tests/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBS = -lXvMCW -lXvMC -lXv -lX11
-
-#############################################
-
-.PHONY: default clean
-
-default: test_context test_surface test_subpicture test_blocks test_rendering xvmc_bench
-
-test_context: test_context.o testlib.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
-test_surface: test_surface.o testlib.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
-test_subpicture: test_subpicture.o testlib.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
-test_blocks: test_blocks.o testlib.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
-test_rendering: test_rendering.o testlib.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
-xvmc_bench: xvmc_bench.o testlib.o
-	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
-
-clean:
-	$(RM) -rf *.o test_context test_surface test_subpicture test_blocks test_rendering xvmc_bench
diff --git a/src/gallium/state_trackers/xvmc/tests/test_subpicture.c b/src/gallium/state_trackers/xvmc/tests/test_subpicture.c
index 9336bfac446..b0ebdce1c2b 100644
--- a/src/gallium/state_trackers/xvmc/tests/test_subpicture.c
+++ b/src/gallium/state_trackers/xvmc/tests/test_subpicture.c
@@ -28,6 +28,7 @@
 #include <assert.h>
 #include <error.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include "testlib.h"
 
 static void PrintGUID(const char *guid)
diff --git a/src/gallium/state_trackers/xvmc/tests/testlib.c b/src/gallium/state_trackers/xvmc/tests/testlib.c
index de3b8da7787..741310f0b48 100644
--- a/src/gallium/state_trackers/xvmc/tests/testlib.c
+++ b/src/gallium/state_trackers/xvmc/tests/testlib.c
@@ -27,6 +27,7 @@
 
 #include "testlib.h"
 #include <stdio.h>
+#include <stdlib.h>
 
 /*
 void test(int pred, const char *pred_string, const char *doc_string, const char *file, unsigned int line)