[Mesa-dev] [PATCH 6/7] automake: src/mesa/drivers/dri/swrast

[Matt Turner]

---
 configure.ac                                 |    8 ++++
 src/mesa/drivers/dri/swrast/Makefile         |   27 ------------
 src/mesa/drivers/dri/swrast/Makefile.am      |   58 ++++++++++++++++++++++++++
 src/mesa/drivers/dri/swrast/Makefile.sources |   11 +++++
 4 files changed, 77 insertions(+), 27 deletions(-)
 delete mode 100644 src/mesa/drivers/dri/swrast/Makefile
 create mode 100644 src/mesa/drivers/dri/swrast/Makefile.am
 create mode 100644 src/mesa/drivers/dri/swrast/Makefile.sources

diff --git a/configure.ac b/configure.ac
index 2ca35ab..bdb47fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1330,11 +1330,18 @@ case $DRI_DIRS in
     ;;
 esac
 
+case $DRI_DIRS in
+*swrast*)
+    HAVE_SWRAST_DRI=yes;
+    ;;
+esac
+
 AM_CONDITIONAL(HAVE_I915_DRI, test x$HAVE_I915_DRI = xyes)
 AM_CONDITIONAL(HAVE_I965_DRI, test x$HAVE_I965_DRI = xyes)
 AM_CONDITIONAL(HAVE_NOUVEAU_DRI, test x$HAVE_NOUVEAU_DRI = xyes)
 AM_CONDITIONAL(HAVE_R200_DRI, test x$HAVE_R200_DRI = xyes)
 AM_CONDITIONAL(HAVE_RADEON_DRI, test x$HAVE_RADEON_DRI = xyes)
+AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes)
 
 dnl
 dnl OSMesa configuration
@@ -1967,6 +1974,7 @@ AC_CONFIG_FILES([configs/autoconf
 		src/mesa/drivers/dri/nouveau/Makefile
 		src/mesa/drivers/dri/r200/Makefile
 		src/mesa/drivers/dri/radeon/Makefile
+		src/mesa/drivers/dri/swrast/Makefile
 		tests/Makefile
 		tests/glx/Makefile])
 
diff --git a/src/mesa/drivers/dri/swrast/Makefile b/src/mesa/drivers/dri/swrast/Makefile
deleted file mode 100644
index 509fa28..0000000
--- a/src/mesa/drivers/dri/swrast/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# src/mesa/drivers/dri/swrast/Makefile
-
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = swrast_dri.so
-
-include ../Makefile.defines
-
-DRIVER_DEFINES = -D__NOT_HAVE_DRM_H
-
-DRIVER_SOURCES = \
-	swrast.c \
-	swrast_span.c
-
-C_SOURCES = \
-	$(SWRAST_COMMON_SOURCES) \
-	$(DRIVER_SOURCES)
-
-ASM_SOURCES =
-
-SWRAST_COMMON_SOURCES = \
-	../common/utils.c \
-	../common/drisw_util.c
-
-include ../Makefile.targets
-
diff --git a/src/mesa/drivers/dri/swrast/Makefile.am b/src/mesa/drivers/dri/swrast/Makefile.am
new file mode 100644
index 0000000..218b536
--- /dev/null
+++ b/src/mesa/drivers/dri/swrast/Makefile.am
@@ -0,0 +1,58 @@
+
+
+# Copyright © 2011 Matt Turner <mattst88 at gmail.com>
+#
+# 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
+
+# Hack to make some of the non-automake variables work.
+TOP=$(top_builddir)
+
+AM_CPPFLAGS = \
+	-D__NOT_HAVE_DRM_H \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/src/ \
+	-I$(top_srcdir)/src/mapi \
+	-I$(top_srcdir)/src/mesa/ \
+	-I../common \
+	$(DEFINES) \
+	$(ASM_FLAGS) \
+	$(API_DEFINES)
+
+dridir = $(DRI_DRIVER_INSTALL_DIR)
+
+if HAVE_I965_DRI
+dri_LTLIBRARIES = swrast_dri.la
+endif
+
+swrast_dri_la_SOURCES = \
+	$(SWRAST_C_FILES)
+
+swrast_dri_la_LDFLAGS = -module -avoid-version -shared
+swrast_dri_la_LIBADD = \
+	$(DRI_LIB_DEPS) \
+	$(DRICORE_LIB_DEPS)
+
+# Provide compatibility with scripts for the old Mesa build system for
+# a while by putting a link to the driver into /lib of the build tree.
+all-local: swrast_dri.la
+	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+	ln -f .libs/swrast_dri.so $(top_builddir)/$(LIB_DIR)/swrast_dri.so;
diff --git a/src/mesa/drivers/dri/swrast/Makefile.sources b/src/mesa/drivers/dri/swrast/Makefile.sources
new file mode 100644
index 0000000..9de5cb8
--- /dev/null
+++ b/src/mesa/drivers/dri/swrast/Makefile.sources
@@ -0,0 +1,11 @@
+SWRAST_DRIVER_FILES = \
+	swrast.c \
+	swrast_span.c
+
+SWRAST_COMMON_FILES = \
+	../common/utils.c \
+	../common/drisw_util.c
+
+SWRAST_C_FILES = \
+	$(SWRAST_COMMON_FILES) \
+	$(SWRAST_DRIVER_FILES)
-- 
1.7.3.4