From 047fe04750acdbc9e807bce955aa890e5d1fd268 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Fri, 24 Aug 2012 11:46:32 -0700 Subject: [PATCH] trace: Convert to automake --- 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 354635b1377..2864314e034 100644 --- 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 index 00000000000..282522db034 --- /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 99e5fb81c22..00000000000 --- 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 00000000000..9adcef1f53f --- /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 -- 2.30.2