3 files changed, 35 insertions, 54 deletions
diff --git a/configure.ac b/configure.ac
index 59226545526..fd7cefd0a95 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2100,6 +2100,7 @@ AC_CONFIG_FILES([configs/current
 		src/gallium/targets/xvmc-r300/Makefile
 		src/gallium/targets/xvmc-r600/Makefile
 		src/gallium/targets/xvmc-softpipe/Makefile
+		src/gallium/tests/trivial/Makefile
 		src/gallium/winsys/Makefile
 		src/gallium/winsys/i915/drm/Makefile
 		src/gallium/winsys/i915/sw/Makefile
diff --git a/src/gallium/tests/trivial/Makefile b/src/gallium/tests/trivial/Makefile
deleted file mode 100644
index 8c032016538..00000000000
--- a/src/gallium/tests/trivial/Makefile
+++ /dev/null
@@ -1,54 +0,0 @@
-# src/gallium/tests/trivial/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 += \
-	$(GALLIUM_PIPE_LOADER_LIBS) \
-	$(GALLIUM_AUXILIARIES) \
-	$(PROG_LINKS) $(LIBUDEV_LIBS)
-
-SOURCES = \
-	tri.c \
-	quad-tex.c \
-	compute.c
-
-OBJECTS = $(SOURCES:.c=.o)
-
-PROGS = $(OBJECTS:.o=)
-
-PROG_DEFINES = -DPIPE_SEARCH_DIR=\"$(PIPE_SRC_DIR)\" \
-               $(GALLIUM_PIPE_LOADER_DEFINES)
-
-PIPE_SRC_DIR = $(TOP)/src/gallium/targets/pipe-loader
-
-##### TARGETS #####
-
-default: $(PROGS) pipes
-
-install:
-
-clean:
-	-rm -f $(PROGS)
-	-rm -f *.o
-	-rm -f result.bmp
-	@$(MAKE) -C $(PIPE_SRC_DIR) clean
-
-pipes:
-	@$(MAKE) -C $(PIPE_SRC_DIR)
-
-##### RULES #####
-
-$(OBJECTS): %.o: %.c
-	$(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $(PROG_DEFINES) $< -o $@
-
-$(PROGS): %: %.o $(LINKS)
-	$(CXX) $(LDFLAGS) $< $(LINKS) $(LLVM_LIBS) -lm -lpthread -ldl -o $@
diff --git a/src/gallium/tests/trivial/Makefile.am b/src/gallium/tests/trivial/Makefile.am
new file mode 100644
index 00000000000..e6e9ae73d12
--- /dev/null
+++ b/src/gallium/tests/trivial/Makefile.am
@@ -0,0 +1,34 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
+PIPE_SRC_DIR = $(top_builddir)/src/gallium/targets/pipe-loader
+
+AM_CFLAGS = \
+	$(GALLIUM_CFLAGS)
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/gallium/drivers \
+	-I$(top_srcdir)/src/gallium/winsys \
+	-DPIPE_SEARCH_DIR=\"$(PIPE_SRC_DIR)/.libs\" \
+	$(GALLIUM_PIPE_LOADER_DEFINES)
+
+LDADD = $(GALLIUM_PIPE_LOADER_LIBS) \
+	$(top_builddir)/src/gallium/auxiliary/libgallium.la \
+	$(LIBUDEV_LIBS) \
+	$(DLOPEN_LIBS) \
+	$(PTHREAD_LIBS) \
+	-lm
+
+noinst_PROGRAMS = compute tri quad-tex
+
+compute_SOURCES = compute.c
+
+tri_SOURCES = tri.c
+
+quad_tex_SOURCES = quad-tex.c
+
+all-local:
+	@$(MAKE) -C $(PIPE_SRC_DIR)
+
+clean-local:
+	@$(MAKE) -C $(PIPE_SRC_DIR) clean
+	-rm -f result.bmp