i915/winsys/drm: Convert to automake

diff --git a/configure.ac b/configure.ac
index 147589d9960b951a3bced53ced425eada9389929..e2af0817b465bea741fb6c283bc68e37030a2676 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2018,6 +2018,7 @@ AC_CONFIG_FILES([configs/current
                src/gallium/targets/Makefile
                src/gallium/targets/opencl/Makefile
                src/gallium/winsys/Makefile
+               src/gallium/winsys/i915/drm/Makefile
                src/gallium/winsys/radeon/drm/Makefile
                src/gbm/Makefile
                src/gbm/main/gbm.pc

diff --git a/src/gallium/winsys/i915/drm/.gitignore b/src/gallium/winsys/i915/drm/.gitignore
new file mode 100644 (file)
index 0000000..f3c7a7c
--- /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 (file)
index ebe3ded..0000000
--- 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 (file)
index 0000000..b7b6145
--- /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