4 files changed, 66 insertions, 37 deletions
diff --git a/configure.ac b/configure.ac
index 8fe840396fd..fa1c48ae631 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2015,6 +2015,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 00000000000..f3c7a7c5da6
--- /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 27b5d991a75..00000000000
--- 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 00000000000..b6c3c6a4235
--- /dev/null
+++ b/src/gallium/drivers/softpipe/Makefile.am
@@ -0,0 +1,64 @@
+# Copyright © 2012 Intel Corporation
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice (including the next
+# paragraph) shall be included in all copies or substantial portions of the
+# Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+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