[Mesa-dev] [PATCH 5/6] trace: Convert to automake

[Tom Stellard]

---
 configure.ac                          |    1 +
 src/gallium/drivers/trace/.gitignore  |    2 ++
 src/gallium/drivers/trace/Makefile    |   13 -------------
 src/gallium/drivers/trace/Makefile.am |   17 +++++++++++++++++
 4 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 src/gallium/drivers/trace/.gitignore
 delete mode 100644 src/gallium/drivers/trace/Makefile
 create mode 100644 src/gallium/drivers/trace/Makefile.am

diff --git a/configure.ac b/configure.ac
index 3129001..43cf072 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2136,6 +2136,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/targets/opencl/Makefile
 		src/gallium/winsys/radeon/drm/Makefile
 		src/gbm/Makefile
diff --git a/src/gallium/drivers/trace/.gitignore b/src/gallium/drivers/trace/.gitignore
new file mode 100644
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
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
index 0000000..1cc7a48
--- /dev/null
+++ b/src/gallium/drivers/trace/Makefile.am
@@ -0,0 +1,17 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
+noinst_LTLIBRARIES = libtrace.la
+
+libtrace_la_CFLAGS = \
+	$(GALLIUM_CFLAGS)
+
+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
-- 
1.7.6.5