summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/i915/drm
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gmail.com>2012-08-29 10:37:07 -0700
committerAndreas Boll <andreas.boll.dev@gmail.com>2013-01-10 22:01:07 +0100
commit266d639b91085cb8bb245f7ca017a16572b58c60 (patch)
tree4b3b6a1a94b1b39a2f933fd5ead96d1e58a5fcb0 /src/gallium/winsys/i915/drm
parent7d5496ab3bdd900f034af1871f2a3c5ee57a5e21 (diff)
i915/winsys/drm: Convert to automake
Diffstat (limited to 'src/gallium/winsys/i915/drm')
-rw-r--r--src/gallium/winsys/i915/drm/.gitignore1
-rw-r--r--src/gallium/winsys/i915/drm/Makefile13
-rw-r--r--src/gallium/winsys/i915/drm/Makefile.am38
3 files changed, 39 insertions, 13 deletions
diff --git a/src/gallium/winsys/i915/drm/.gitignore b/src/gallium/winsys/i915/drm/.gitignore
new file mode 100644
index 00000000000..f3c7a7c5da6
--- /dev/null
+++ b/src/gallium/winsys/i915/drm/.gitignore
@@ -0,0 +1 @@
+Makefile
diff --git a/src/gallium/winsys/i915/drm/Makefile b/src/gallium/winsys/i915/drm/Makefile
deleted file mode 100644
index ebe3ded7ac2..00000000000
--- a/src/gallium/winsys/i915/drm/Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = i915drm
-
-# get C_SOURCES
-include Makefile.sources
-
-LIBRARY_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
-
-LIBRARY_DEFINES = $(shell $(PKG_CONFIG) libdrm --cflags-only-other)
-
-include ../../../Makefile.template
diff --git a/src/gallium/winsys/i915/drm/Makefile.am b/src/gallium/winsys/i915/drm/Makefile.am
new file mode 100644
index 00000000000..b7b61454294
--- /dev/null
+++ b/src/gallium/winsys/i915/drm/Makefile.am
@@ -0,0 +1,38 @@
+# 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_CFLAGS = \
+ -I$(top_srcdir)/include \
+ -I$(top_srcdir)/src/gallium/drivers \
+ $(GALLIUM_CFLAGS) \
+ $(INTEL_CFLAGS)
+
+noinst_LTLIBRARIES = libi915drm.la
+
+libi915drm_la_SOURCES = $(C_SOURCES)
+
+#XXX: Delete this when all targets using the i915 winsys are converted to automake.
+all-local: libi915drm.la
+ ln -f $(builddir)/.libs/libi915drm.a $(builddir)/libi915drm.a