[Mesa-dev] [PATCH 14/32] softpipe: Convert to automake

[Matt Turner]

---
 configure.ac                             |    1 +
 src/gallium/drivers/softpipe/.gitignore  |    1 +
 src/gallium/drivers/softpipe/Makefile    |   37 --------------------------
 src/gallium/drivers/softpipe/Makefile.am |   42 ++++++++++++++++++++++++++++++
 4 files changed, 44 insertions(+), 37 deletions(-)
 create mode 100644 src/gallium/drivers/softpipe/.gitignore
 delete mode 100644 src/gallium/drivers/softpipe/Makefile
 create mode 100644 src/gallium/drivers/softpipe/Makefile.am

diff --git a/configure.ac b/configure.ac
index 162cedd..c0ff3d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2024,6 +2024,7 @@ AC_CONFIG_FILES([configs/current
 		src/gallium/drivers/r300/Makefile
 		src/gallium/drivers/r600/Makefile
 		src/gallium/drivers/rbug/Makefile
+		src/gallium/drivers/softpipe/Makefile
 		src/gallium/drivers/trace/Makefile
 		src/gallium/state_trackers/clover/Makefile
 		src/gallium/targets/Makefile
diff --git a/src/gallium/drivers/softpipe/.gitignore b/src/gallium/drivers/softpipe/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/drivers/softpipe/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/drivers/softpipe/Makefile b/src/gallium/drivers/softpipe/Makefile
deleted file mode 100644
index 27b5d991..0000000
--- a/src/gallium/drivers/softpipe/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = softpipe
-
-C_SOURCES = \
-	sp_fs_exec.c \
-	sp_clear.c \
-	sp_fence.c \
-	sp_flush.c \
-	sp_query.c \
-	sp_context.c \
-	sp_draw_arrays.c \
-	sp_prim_vbuf.c \
-	sp_quad_pipe.c \
-	sp_quad_stipple.c \
-	sp_quad_depth_test.c \
-	sp_quad_fs.c \
-	sp_quad_blend.c \
-	sp_screen.c \
-	sp_setup.c \
-	sp_state_blend.c \
-	sp_state_clip.c \
-	sp_state_derived.c \
-	sp_state_sampler.c \
-	sp_state_shader.c \
-	sp_state_so.c \
-	sp_state_rasterizer.c \
-	sp_state_surface.c \
-	sp_state_vertex.c \
-	sp_texture.c \
-	sp_tex_sample.c \
-	sp_tex_tile_cache.c \
-	sp_tile_cache.c \
-	sp_surface.c
-
-include ../../Makefile.template
diff --git a/src/gallium/drivers/softpipe/Makefile.am b/src/gallium/drivers/softpipe/Makefile.am
new file mode 100644
index 0000000..7d77a26
--- /dev/null
+++ b/src/gallium/drivers/softpipe/Makefile.am
@@ -0,0 +1,42 @@
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/gallium/drivers \
+	-I$(top_srcdir)/include \
+	$(GALLIUM_CFLAGS)
+
+noinst_LTLIBRARIES = libsoftpipe.la
+
+libsoftpipe_la_SOURCES = \
+	sp_fs_exec.c \
+	sp_clear.c \
+	sp_fence.c \
+	sp_flush.c \
+	sp_query.c \
+	sp_context.c \
+	sp_draw_arrays.c \
+	sp_prim_vbuf.c \
+	sp_quad_pipe.c \
+	sp_quad_stipple.c \
+	sp_quad_depth_test.c \
+	sp_quad_fs.c \
+	sp_quad_blend.c \
+	sp_screen.c \
+	sp_setup.c \
+	sp_state_blend.c \
+	sp_state_clip.c \
+	sp_state_derived.c \
+	sp_state_sampler.c \
+	sp_state_shader.c \
+	sp_state_so.c \
+	sp_state_rasterizer.c \
+	sp_state_surface.c \
+	sp_state_vertex.c \
+	sp_texture.c \
+	sp_tex_sample.c \
+	sp_tex_tile_cache.c \
+	sp_tile_cache.c \
+	sp_surface.c
+
+all-local: libsoftpipe.la
+	ln -f $(builddir)/.libs/libsoftpipe.a $(builddir)/libsoftpipe.a
-- 
1.7.8.6