2 files changed, 34 insertions, 49 deletions
diff --git a/src/gallium/tests/unit/Makefile b/src/gallium/tests/unit/Makefile
deleted file mode 100644
index bb3039f3bc7..00000000000
--- a/src/gallium/tests/unit/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# progs/gallium/simple/Makefile
-
-TOP = ../../../..
-include $(TOP)/configs/current
-
-INCLUDES = \
-	-I. \
-	-I$(TOP)/src/gallium/include \
-	-I$(TOP)/src/gallium/auxiliary \
-	-I$(TOP)/src/gallium/drivers \
-	-I$(TOP)/src/gallium/winsys \
-	$(PROG_INCLUDES)
-
-LINKS = \
-	$(TOP)/src/gallium/drivers/trace/libtrace.a \
-	$(TOP)/src/gallium/winsys/sw/null/libws_null.a \
-	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
-	$(GALLIUM_AUXILIARIES) \
-	$(PROG_LINKS)
-
-SOURCES = \
-	pipe_barrier_test.c \
-	u_cache_test.c \
-	u_half_test.c \
-	u_format_test.c \
-	u_format_compatible_test.c \
-	translate_test.c
-
-
-OBJECTS = $(SOURCES:.c=.o)
-
-PROGS = $(OBJECTS:.o=)
-
-##### TARGETS #####
-
-default: $(PROGS)
-
-clean:
-	-rm -f $(PROGS)
-	-rm -f *.o
-	-rm -f result.bmp
-
-##### RULES #####
-
-$(OBJECTS): %.o: %.c
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $(PROG_DEFINES) $< -o $@
-
-$(PROGS): %: %.o
-	$(CC) $(LDFLAGS) $< $(LINKS) -lm -lpthread -ldl -o $@
diff --git a/src/gallium/tests/unit/Makefile.am b/src/gallium/tests/unit/Makefile.am
new file mode 100644
index 00000000000..c157cc026da
--- /dev/null
+++ b/src/gallium/tests/unit/Makefile.am
@@ -0,0 +1,34 @@
+# TODO: wire up some useful tests to make check
+
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = \
+	$(GALLIUM_CFLAGS)
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/gallium/drivers \
+	-I$(top_srcdir)/src/gallium/winsys
+
+LDADD = \
+	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
+	$(top_builddir)/src/gallium/winsys/sw/null/libws_null.la \
+	$(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
+	$(DLOPEN_LIBS) \
+	$(PTHREAD_LIBS) \
+	-lm
+
+noinst_PROGRAMS = pipe_barrier_test u_cache_test u_half_test \
+	u_format_test u_format_compatible_test translate_test
+
+pipe_barrier_test_SOURCES = pipe_barrier_test.c
+
+u_cache_test_SOURCES = u_cache_test.c
+
+u_half_test_SOURCES = u_half_test.c
+
+u_format_test_SOURCES = u_format_test.c
+
+u_format_compatible_test_SOURCES = u_format_compatible_test.c
+
+translate_test_SOURCES = translate_test.c