summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2012-08-29 10:31:29 -0700
committerAndreas Boll <andreas.boll.dev@gmail.com>2013-01-10 22:01:07 +0100
commit7d5496ab3bdd900f034af1871f2a3c5ee57a5e21 (patch)
tree83b27adabe45a2153cc5c123ee0441e0a00e272e
parent533130a5bbf1b05279cf88731e1758e2d6fd4b36 (diff)
i915g: Convert to automake
-rw-r--r--configure.ac1
-rw-r--r--src/gallium/drivers/i915/.gitignore1
-rw-r--r--src/gallium/drivers/i915/Makefile9
-rw-r--r--src/gallium/drivers/i915/Makefile.am36
4 files changed, 38 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index 4be2050cff8..147589d9960 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2010,6 +2010,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 00000000000..f3c7a7c5da6
--- /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 0e576784846..00000000000
--- 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 00000000000..5c73811af0f
--- /dev/null
+++ b/src/gallium/drivers/i915/Makefile.am
@@ -0,0 +1,36 @@
+# 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
+
+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