[Mesa-dev] [PATCH 09/32] i915g: Convert to automake

[Matt Turner]

---
 configure.ac                         |    1 +
 src/gallium/drivers/i915/.gitignore  |    1 +
 src/gallium/drivers/i915/Makefile    |    9 ---------
 src/gallium/drivers/i915/Makefile.am |   14 ++++++++++++++
 4 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 src/gallium/drivers/i915/.gitignore
 delete mode 100644 src/gallium/drivers/i915/Makefile
 create mode 100644 src/gallium/drivers/i915/Makefile.am

diff --git a/configure.ac b/configure.ac
index c34dc2c..60ffb66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2019,6 +2019,7 @@ AC_CONFIG_FILES([configs/current
 		src/gallium/auxiliary/Makefile
 		src/gallium/auxiliary/pipe-loader/Makefile
 		src/gallium/drivers/Makefile
+		src/gallium/drivers/i915/Makefile
 		src/gallium/drivers/r300/Makefile
 		src/gallium/drivers/r600/Makefile
 		src/gallium/drivers/trace/Makefile
diff --git a/src/gallium/drivers/i915/.gitignore b/src/gallium/drivers/i915/.gitignore
new file mode 100644
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/drivers/i915/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/drivers/i915/Makefile b/src/gallium/drivers/i915/Makefile
deleted file mode 100644
index 0e57678..0000000
--- a/src/gallium/drivers/i915/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = i915
-
-# get C_SOURCES
-include Makefile.sources
-
-include ../../Makefile.template
diff --git a/src/gallium/drivers/i915/Makefile.am b/src/gallium/drivers/i915/Makefile.am
new file mode 100644
index 0000000..fc830ab
--- /dev/null
+++ b/src/gallium/drivers/i915/Makefile.am
@@ -0,0 +1,14 @@
+include Makefile.sources
+include $(top_srcdir)/src/gallium/Automake.inc
+
+noinst_LTLIBRARIES = libi915.la
+
+AM_CPPFLAGS = \
+	-I$(top_srcdir)/src/gallium/drivers \
+	-I$(top_srcdir)/include \
+	$(GALLIUM_CFLAGS)
+
+libi915_la_SOURCES = $(C_SOURCES)
+
+all-local: libi915.la
+	ln -f $(builddir)/.libs/libi915.a $(builddir)/libi915.a
-- 
1.7.8.6