state_trackers/dri/drm: Convert to automake

diff --git a/configure.ac b/configure.ac
index c15367e..4ed0e4e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2025,6 +2025,7 @@ AC_CONFIG_FILES([configs/current
                src/gallium/drivers/trace/Makefile
                src/gallium/state_trackers/clover/Makefile
                src/gallium/state_trackers/dri/Makefile
+               src/gallium/state_trackers/dri/drm/Makefile
                src/gallium/targets/Makefile
                src/gallium/targets/opencl/Makefile
                src/gallium/winsys/Makefile

diff --git a/src/gallium/state_trackers/dri/drm/.gitignore b/src/gallium/state_trackers/dri/drm/.gitignore
new file mode 100644 (file)
index 0000000..f3c7a7c
--- /dev/null
+++ b/src/gallium/state_trackers/dri/drm/.gitignore
@@ -0,0 +1 @@
+Makefile

diff --git a/src/gallium/state_trackers/dri/drm/Makefile b/src/gallium/state_trackers/dri/drm/Makefile
deleted file mode 100644 (file)
index 0eeeb9d..0000000
--- a/src/gallium/state_trackers/dri/drm/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = dridrm
-
-LIBRARY_INCLUDES = \
-       -I$(TOP)/include \
-       -I$(TOP)/src/mapi \
-       -I$(TOP)/src/mesa \
-       -I$(TOP)/src/gallium/state_trackers/dri/common \
-       -I$(TOP)/src/mesa/drivers/dri/common \
-       -I$(TOP)/src/mesa/main \
-         $(shell $(PKG_CONFIG) --cflags-only-I libdrm)
-
-
-C_SOURCES = \
-       dri_context.c \
-       dri_screen.c \
-       dri_drawable.c \
-       dri2.c
-
-#      $(TOP)/src/mesa/drivers/dri/common/utils.c \
-       $(TOP)/src/mesa/drivers/dri/common/dri_util.c \
-       $(TOP)/src/mesa/drivers/dri/common/xmlconfig.c \
-       $(TOP)/src/mesa/drivers/common/driverfuncs.c
-
-include ../../../Makefile.template

diff --git a/src/gallium/state_trackers/dri/drm/Makefile.am b/src/gallium/state_trackers/dri/drm/Makefile.am
new file mode 100644 (file)
index 0000000..20bebeb
--- /dev/null
+++ b/src/gallium/state_trackers/dri/drm/Makefile.am
@@ -0,0 +1,43 @@
+# 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 $(top_srcdir)/src/gallium/Automake.inc
+
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/include \
+       -I$(top_srcdir)/src/mapi \
+       -I$(top_srcdir)/src/mesa \
+       -I$(top_srcdir)/src/gallium/state_trackers/dri/common \
+       -I$(top_srcdir)/src/mesa/drivers/dri/common \
+       $(GALLIUM_CFLAGS) \
+       $(LIBDRM_CFLAGS)
+
+noinst_LTLIBRARIES = libdridrm.la
+
+libdridrm_la_SOURCES = \
+       dri_context.c \
+       dri_screen.c \
+       dri_drawable.c \
+       dri2.c
+
+all-local: libdridrm.la
+       ln -f $(builddir)/.libs/libdridrm.a $(builddir)/libdridrm.a