targets/dri-swrast: Convert to automake

v2: Andreas Boll <andreas.boll.dev@gmail.com>
    - Provide compatibility with scripts for the old Mesa build system

diff --git a/configure.ac b/configure.ac
index 661a0b2f42bf59a577cac4c3152b80ec5cb442b8..23df744783958e77f859ca593b77306f662dab2a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2059,6 +2059,7 @@ AC_CONFIG_FILES([configs/current
                src/gallium/targets/dri-r300/Makefile
                src/gallium/targets/dri-r600/Makefile
                src/gallium/targets/dri-radeonsi/Makefile
+               src/gallium/targets/dri-swrast/Makefile
                src/gallium/targets/opencl/Makefile
                src/gallium/winsys/Makefile
                src/gallium/winsys/i915/drm/Makefile

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

diff --git a/src/gallium/targets/dri-swrast/Makefile b/src/gallium/targets/dri-swrast/Makefile
deleted file mode 100644 (file)
index e83e024..0000000
--- a/src/gallium/targets/dri-swrast/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-TOP = ../../../..
-include $(TOP)/configs/current
-
-LIBNAME = swrast_dri.so
-
-DRIVER_DEFINES = \
-       -D__NOT_HAVE_DRM_H -DGALLIUM_SOFTPIPE \
-       -DGALLIUM_RBUG -DGALLIUM_TRACE
-
-PIPE_DRIVERS = \
-       $(TOP)/src/gallium/state_trackers/dri/sw/libdrisw.a \
-       $(TOP)/src/gallium/winsys/sw/dri/libswdri.a \
-       $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
-       $(TOP)/src/gallium/drivers/trace/libtrace.a \
-       $(TOP)/src/gallium/drivers/rbug/librbug.a
-
-ifeq ($(MESA_LLVM),1)
-PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
-DRIVER_DEFINES += -DGALLIUM_LLVMPIPE
-endif
-
-SWRAST_COMMON_GALLIUM_SOURCES = \
-       $(TOP)/src/mesa/drivers/dri/common/utils.c \
-       $(TOP)/src/mesa/drivers/dri/common/drisw_util.c \
-       $(TOP)/src/mesa/drivers/dri/common/xmlconfig.c
-
-C_SOURCES = \
-       swrast_drm_api.c \
-       $(SWRAST_COMMON_GALLIUM_SOURCES) \
-       $(DRIVER_SOURCES)
-
-ASM_SOURCES =
-
-include ../Makefile.dri
-
-INCLUDES += \
-       -I$(TOP)/src/gallium/winsys/sw/dri
-
-symlinks:

diff --git a/src/gallium/targets/dri-swrast/Makefile.am b/src/gallium/targets/dri-swrast/Makefile.am
new file mode 100644 (file)
index 0000000..82fcfd2
--- /dev/null
+++ b/src/gallium/targets/dri-swrast/Makefile.am
@@ -0,0 +1,78 @@
+# 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_CFLAGS = \
+       $(GALLIUM_CFLAGS) \
+       $(PTHREAD_CFLAGS) \
+       $(LIBDRM_CFLAGS)
+AM_CPPFLAGS = \
+       -I$(top_srcdir)/src/gallium/winsys/sw/dri \
+       -I$(top_srcdir)/src/gallium/drivers \
+       -I$(top_srcdir)/src/gallium/winsys \
+       -I$(top_srcdir)/src/mesa \
+       -I$(top_srcdir)/src/mapi \
+       -DGALLIUM_RBUG \
+       -DGALLIUM_TRACE \
+       -DGALLIUM_SOFTPIPE \
+       -D__NOT_HAVE_DRM_H
+
+dridir = $(DRI_DRIVER_INSTALL_DIR)
+dri_LTLIBRARIES = swrast_dri.la
+
+swrast_dri_la_SOURCES = \
+       swrast_drm_api.c \
+       $(top_srcdir)/src/mesa/drivers/dri/common/utils.c \
+       $(top_srcdir)/src/mesa/drivers/dri/common/drisw_util.c \
+       $(top_srcdir)/src/mesa/drivers/dri/common/xmlconfig.c
+
+swrast_dri_la_LDFLAGS = -module -avoid-version -shared -no-undefined
+
+swrast_dri_la_LIBADD = \
+       $(top_builddir)/src/mesa/libmesagallium.la \
+       $(top_builddir)/src/gallium/auxiliary/libgallium.la \
+       $(top_builddir)/src/gallium/state_trackers/dri/sw/libdrisw.la \
+       $(top_builddir)/src/gallium/winsys/sw/dri/libswdri.la \
+       $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la \
+       $(top_builddir)/src/gallium/drivers/trace/libtrace.la \
+       $(top_builddir)/src/gallium/drivers/rbug/librbug.la \
+       $(GALLIUM_DRI_LIB_DEPS)
+
+if HAVE_MESA_LLVM
+swrast_dri_la_LINK = $(CXXLINK) $(swrast_dri_la_LDFLAGS)
+# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable
+nodist_EXTRA_swrast_dri_la_SOURCES = dummy-cpp.cpp
+
+AM_CPPFLAGS += -DGALLIUM_LLVMPIPE
+swrast_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS)
+else
+swrast_dri_la_LINK = $(LINK) $(swrast_dri_la_LDFLAGS)
+# Mention a dummy pure C file to trigger generation of the $(LINK) variable
+nodist_EXTRA_swrast_dri_la_SOURCES = dummy-c.c
+endif
+
+# 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)/gallium
+       ln -f .libs/swrast_dri.so $(top_builddir)/$(LIB_DIR)/gallium/swrast_dri.so