trace: Convert to automake

diff --git a/configure.ac b/configure.ac
index 354635b137758d7d27a3403cad4becaace5ee660..2864314e0347f56be4f0d359e92033c2dfb8a806 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2006,6 +2006,7 @@ AC_CONFIG_FILES([configs/current
                src/gallium/drivers/Makefile
                src/gallium/drivers/r300/Makefile
                src/gallium/drivers/r600/Makefile
+               src/gallium/drivers/trace/Makefile
                src/gallium/state_trackers/clover/Makefile
                src/gallium/targets/Makefile
                src/gallium/targets/opencl/Makefile

diff --git a/src/gallium/drivers/trace/.gitignore b/src/gallium/drivers/trace/.gitignore
new file mode 100644 (file)
index 0000000..282522d
--- /dev/null
+++ b/src/gallium/drivers/trace/.gitignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in

diff --git a/src/gallium/drivers/trace/Makefile b/src/gallium/drivers/trace/Makefile
deleted file mode 100644 (file)
index 99e5fb8..0000000
--- a/src/gallium/drivers/trace/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = trace
-
-C_SOURCES = \
-       tr_context.c \
-       tr_dump.c \
-       tr_dump_state.c \
-       tr_screen.c \
-       tr_texture.c
-
-include ../../Makefile.template

diff --git a/src/gallium/drivers/trace/Makefile.am b/src/gallium/drivers/trace/Makefile.am
new file mode 100644 (file)
index 0000000..9adcef1
--- /dev/null
+++ b/src/gallium/drivers/trace/Makefile.am
@@ -0,0 +1,17 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CFLAGS = \
+       $(GALLIUM_CFLAGS)
+
+noinst_LTLIBRARIES = libtrace.la
+
+libtrace_la_SOURCES = \
+       tr_context.c \
+       tr_dump.c \
+       tr_dump_state.c \
+       tr_screen.c \
+       tr_texture.c
+
+#XXX: Delete this when all targets using libtrace are converted to automake
+all-local: libtrace.la
+       ln -f $(builddir)/.libs/libtrace.a $(builddir)/libtrace.a