3 files changed, 40 insertions, 19 deletions
diff --git a/src/gallium/drivers/svga/.gitignore b/src/gallium/drivers/svga/.gitignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/src/gallium/drivers/svga/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/drivers/svga/Makefile b/src/gallium/drivers/svga/Makefile
deleted file mode 100644
index 97f68f06f47..00000000000
--- a/src/gallium/drivers/svga/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = svga
-
-# get C_SOURCES
-include Makefile.sources
-
-LIBRARY_INCLUDES = \
-	-I$(TOP)/src/gallium/drivers/svga/include
-
-# With linux-debug we get a lots of warnings, filter out the bad flags.
-CFLAGS := $(filter-out -pedantic, $(filter-out -ansi, $(CFLAGS)))
-
-LIBRARY_DEFINES = \
-	-std=gnu99 -fvisibility=hidden \
-	-DHAVE_STDINT_H -DHAVE_SYS_TYPES_H
-
-include ../../Makefile.template
diff --git a/src/gallium/drivers/svga/Makefile.am b/src/gallium/drivers/svga/Makefile.am
new file mode 100644
index 00000000000..426fc89ca5f
--- /dev/null
+++ b/src/gallium/drivers/svga/Makefile.am
@@ -0,0 +1,39 @@
+# 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 Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/gallium/drivers/svga/include \
+	-I$(top_srcdir)/src/gallium/drivers \
+	-I$(top_srcdir)/include \
+	$(GALLIUM_CFLAGS)
+
+AM_CFLAGS = -std=gnu99
+
+noinst_LTLIBRARIES = libsvga.la
+
+libsvga_la_SOURCES = $(C_SOURCES)
+
+all-local: libsvga.la
+	ln -f $(builddir)/.libs/libsvga.a $(builddir)/libsvga.a