[Mesa-dev] [PATCH 5/7] automake: src/mesa/drivers/dri/nouveau
Matt Turner
mattst88 at gmail.com
Tue Jan 17 12:58:15 PST 2012
---
configs/linux-dri | 2 +-
configure.ac | 15 ++++---
src/mesa/drivers/dri/nouveau/Makefile | 58 ------------------------
src/mesa/drivers/dri/nouveau/Makefile.am | 59 +++++++++++++++++++++++++
src/mesa/drivers/dri/nouveau/Makefile.sources | 39 ++++++++++++++++
5 files changed, 108 insertions(+), 65 deletions(-)
delete mode 100644 src/mesa/drivers/dri/nouveau/Makefile
create mode 100644 src/mesa/drivers/dri/nouveau/Makefile.am
create mode 100644 src/mesa/drivers/dri/nouveau/Makefile.sources
diff --git a/configs/linux-dri b/configs/linux-dri
index 4877abd..a5efea2 100644
--- a/configs/linux-dri
+++ b/configs/linux-dri
@@ -62,7 +62,7 @@ GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel svga/drm
GALLIUM_TARGET_DIRS = dri-vmwgfx
GALLIUM_STATE_TRACKERS_DIRS = egl dri
-DRI_DIRS = nouveau swrast
+DRI_DIRS = swrast
INTEL_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_intel)
INTEL_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_intel)
diff --git a/configure.ac b/configure.ac
index 6a7d999..2ca35ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1306,6 +1306,13 @@ case $DRI_DIRS in
esac
case $DRI_DIRS in
+*nouveau*)
+ PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED])
+ HAVE_NOUVEAU_DRI=yes;
+ ;;
+esac
+
+case $DRI_DIRS in
*radeon*|*r200*)
PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
@@ -1325,15 +1332,10 @@ 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)
-case $DRI_DIRS in
-*nouveau*)
- PKG_CHECK_MODULES([NOUVEAU], [libdrm_nouveau >= $LIBDRM_NOUVEAU_REQUIRED])
- ;;
-esac
-
dnl
dnl OSMesa configuration
dnl
@@ -1962,6 +1964,7 @@ dnl Substitute the config
AC_CONFIG_FILES([configs/autoconf
src/mesa/drivers/dri/i915/Makefile
src/mesa/drivers/dri/i965/Makefile
+ src/mesa/drivers/dri/nouveau/Makefile
src/mesa/drivers/dri/r200/Makefile
src/mesa/drivers/dri/radeon/Makefile
tests/Makefile
diff --git a/src/mesa/drivers/dri/nouveau/Makefile b/src/mesa/drivers/dri/nouveau/Makefile
deleted file mode 100644
index e485a98..0000000
--- a/src/mesa/drivers/dri/nouveau/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# src/mesa/drivers/dri/nouveau/Makefile
-
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = nouveau_vieux_dri.so
-
-include ../Makefile.defines
-
-DRIVER_SOURCES = \
- nouveau_screen.c \
- nouveau_context.c \
- nouveau_fbo.c \
- nouveau_driver.c \
- nouveau_state.c \
- nouveau_bufferobj.c \
- nouveau_span.c \
- nouveau_bo_state.c \
- nouveau_texture.c \
- nouveau_surface.c \
- nouveau_scratch.c \
- nouveau_array.c \
- nv04_context.c \
- nv04_render.c \
- nv04_state_fb.c \
- nv04_state_raster.c \
- nv04_state_tex.c \
- nv04_state_frag.c \
- nv04_surface.c \
- nv10_context.c \
- nv10_render.c \
- nv10_state_fb.c \
- nv10_state_polygon.c \
- nv10_state_raster.c \
- nv10_state_tex.c \
- nv10_state_frag.c \
- nv10_state_tnl.c \
- nv20_context.c \
- nv20_render.c \
- nv20_state_fb.c \
- nv20_state_polygon.c \
- nv20_state_raster.c \
- nv20_state_tex.c \
- nv20_state_frag.c \
- nv20_state_tnl.c
-
-C_SOURCES = \
- $(COMMON_SOURCES) \
- $(DRIVER_SOURCES)
-
-ASM_SOURCES =
-
-INCLUDES += $(NOUVEAU_CFLAGS)
-DRI_LIB_DEPS += $(NOUVEAU_LIBS)
-
-include ../Makefile.targets
-
-symlinks:
diff --git a/src/mesa/drivers/dri/nouveau/Makefile.am b/src/mesa/drivers/dri/nouveau/Makefile.am
new file mode 100644
index 0000000..e345650
--- /dev/null
+++ b/src/mesa/drivers/dri/nouveau/Makefile.am
@@ -0,0 +1,59 @@
+
+
+# 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 = \
+ -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) \
+ $(NOUVEAU_CFLAGS)
+
+dridir = $(DRI_DRIVER_INSTALL_DIR)
+
+if HAVE_NOUVEAU_DRI
+dri_LTLIBRARIES = nouveau_vieux_dri.la
+endif
+
+nouveau_vieux_dri_la_SOURCES = \
+ $(NOUVEAU_C_FILES)
+
+nouveau_vieux_dri_la_LDFLAGS = -module -avoid-version -shared
+nouveau_vieux_dri_la_LIBADD = \
+ $(DRI_LIB_DEPS) \
+ $(DRICORE_LIB_DEPS) \
+ $(NOUVEAU_LIBS)
+
+# 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: nouveau_vieux_dri.la
+ $(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+ ln -f .libs/nouveau_vieux_dri.so $(top_builddir)/$(LIB_DIR)/nouveau_vieux_dri.so;
diff --git a/src/mesa/drivers/dri/nouveau/Makefile.sources b/src/mesa/drivers/dri/nouveau/Makefile.sources
new file mode 100644
index 0000000..aa7f79f
--- /dev/null
+++ b/src/mesa/drivers/dri/nouveau/Makefile.sources
@@ -0,0 +1,39 @@
+NOUVEAU_DRIVER_FILES = \
+ nouveau_screen.c \
+ nouveau_context.c \
+ nouveau_fbo.c \
+ nouveau_driver.c \
+ nouveau_state.c \
+ nouveau_bufferobj.c \
+ nouveau_span.c \
+ nouveau_bo_state.c \
+ nouveau_texture.c \
+ nouveau_surface.c \
+ nouveau_scratch.c \
+ nouveau_array.c \
+ nv04_context.c \
+ nv04_render.c \
+ nv04_state_fb.c \
+ nv04_state_raster.c \
+ nv04_state_tex.c \
+ nv04_state_frag.c \
+ nv04_surface.c \
+ nv10_context.c \
+ nv10_render.c \
+ nv10_state_fb.c \
+ nv10_state_polygon.c \
+ nv10_state_raster.c \
+ nv10_state_tex.c \
+ nv10_state_frag.c \
+ nv10_state_tnl.c \
+ nv20_context.c \
+ nv20_render.c \
+ nv20_state_fb.c \
+ nv20_state_polygon.c \
+ nv20_state_raster.c \
+ nv20_state_tex.c \
+ nv20_state_frag.c \
+ nv20_state_tnl.c
+
+NOUVEAU_C_FILES = \
+ $(NOUVEAU_DRIVER_FILES)
--
1.7.3.4
More information about the mesa-dev
mailing list