Mesa (master): automake: src/mesa/drivers/dri/r200

Matt Turner mattst88 at kemper.freedesktop.org
Fri Jan 20 20:56:25 UTC 2012 

Module: Mesa
Branch: master
Commit: b38d7a0a248c2a3ad227cb5d21c1c95a6519e4ae
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b38d7a0a248c2a3ad227cb5d21c1c95a6519e4ae

Author: Matt Turner <mattst88 at gmail.com>
Date:   Sun Jan 15 10:04:58 2012 -0500

automake: src/mesa/drivers/dri/r200

---

 configs/freebsd-dri                        |    3 -
 configs/linux-dri                          |    2 +-
 configs/linux-dri-debug                    |    6 ---
 configs/linux-dri-ppc                      |    5 --
 configs/linux-dri-x86-64                   |    3 -
 configs/linux-dri-xcb                      |    1 -
 configure.ac                               |   14 +++----
 src/mesa/drivers/dri/r200/.gitignore       |    5 ++
 src/mesa/drivers/dri/r200/Makefile         |   58 --------------------------
 src/mesa/drivers/dri/r200/Makefile.am      |   61 ++++++++++++++++++++++++++++
 src/mesa/drivers/dri/r200/Makefile.sources |   34 +++++++++++++++
 11 files changed, 107 insertions(+), 85 deletions(-)

diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index 17ae06b..00a11d4 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -46,6 +46,3 @@ SRC_DIRS = glx gallium mesa glu
 DRIVER_DIRS = dri
 
 DRM_SOURCE_PATH=$(TOP)/../drm
-
-DRI_DIRS = i915 i965 r200
-
diff --git a/configs/linux-dri b/configs/linux-dri
index 8d60063..4877abd 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 r200 swrast
+DRI_DIRS = nouveau swrast
 
 INTEL_LIBS = $(shell $(PKG_CONFIG) --libs libdrm_intel)
 INTEL_CFLAGS = $(shell $(PKG_CONFIG) --cflags libdrm_intel)
diff --git a/configs/linux-dri-debug b/configs/linux-dri-debug
index 7df03df..4ee5d71 100644
--- a/configs/linux-dri-debug
+++ b/configs/linux-dri-debug
@@ -6,9 +6,3 @@ include $(TOP)/configs/linux-dri
 CONFIG_NAME = linux-dri-debug
 OPT_FLAGS  = -O0 -g
 ARCH_FLAGS = -DDEBUG
-
-# Helpful to reduce the amount of stuff that gets built sometimes:
-#DRI_DIRS = i915tex i915 
-#DRI_DIRS = i965
-#DRI_DIRS = r200
-
diff --git a/configs/linux-dri-ppc b/configs/linux-dri-ppc
index 507e0c6..386d6a7 100644
--- a/configs/linux-dri-ppc
+++ b/configs/linux-dri-ppc
@@ -10,8 +10,3 @@ PIC_FLAGS = -fPIC
 
 ASM_FLAGS = -DUSE_PPC_ASM -DUSE_VMX_ASM
 MESA_ASM_SOURCES = $(PPC_SOURCES)
-
-# Build only the drivers for cards that exist on PowerPC.  At some point MGA
-# will be added, but not yet.
-DRI_DIRS = r200
-
diff --git a/configs/linux-dri-x86-64 b/configs/linux-dri-x86-64
index ebd6351..6cd6294 100644
--- a/configs/linux-dri-x86-64
+++ b/configs/linux-dri-x86-64
@@ -15,6 +15,3 @@ LIB_DIR = lib64
 
 # Library/program dependencies
 EXTRA_LIB_PATH=-L/usr/X11R6/lib64
-
-DRI_DIRS = i915 i965 r200
-
diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index 905a333..fd72c68 100644
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -52,4 +52,3 @@ GL_LIB_DEPS   = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
 SRC_DIRS = glx gallium mesa glu
 
 DRIVER_DIRS = dri
-DRI_DIRS = i915 r200
diff --git a/configure.ac b/configure.ac
index c0bdacb..9599001 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1272,7 +1272,7 @@ case $DRI_DIRS in
 esac
 
 case $DRI_DIRS in
-*radeon*)
+*radeon*|*r200*)
     PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
 
     for d in $(echo $DRI_DIRS | sed 's/,/ /g'); do
@@ -1280,6 +1280,9 @@ case $DRI_DIRS in
         radeon)
             HAVE_RADEON_DRI=yes;
             ;;
+        r200)
+            HAVE_R200_DRI=yes;
+            ;;
         esac
     done
 
@@ -1288,6 +1291,7 @@ 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_R200_DRI, test x$HAVE_R200_DRI = xyes)
 AM_CONDITIONAL(HAVE_RADEON_DRI, test x$HAVE_RADEON_DRI = xyes)
 
 case $DRI_DIRS in
@@ -1296,13 +1300,6 @@ case $DRI_DIRS in
     ;;
 esac
 
-case $DRI_DIRS in
-*r200*)
-    PKG_CHECK_MODULES([RADEON], [libdrm_radeon >= $LIBDRM_RADEON_REQUIRED])
-    ;;
-esac
-
-
 dnl
 dnl OSMesa configuration
 dnl
@@ -1928,6 +1925,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/r200/Makefile
 		src/mesa/drivers/dri/radeon/Makefile
 		tests/Makefile
 		tests/glx/Makefile])
diff --git a/src/mesa/drivers/dri/r200/.gitignore b/src/mesa/drivers/dri/r200/.gitignore
new file mode 100644
index 0000000..5112c58
--- /dev/null
+++ b/src/mesa/drivers/dri/r200/.gitignore
@@ -0,0 +1,5 @@
+.deps
+.libs
+Makefile
+Makefile.in
+r200_dri.la
diff --git a/src/mesa/drivers/dri/r200/Makefile b/src/mesa/drivers/dri/r200/Makefile
deleted file mode 100644
index e53d64b..0000000
--- a/src/mesa/drivers/dri/r200/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# src/mesa/drivers/dri/r200/Makefile
-
-TOP = ../../../../..
-include $(TOP)/configs/current
-
-LIBNAME = r200_dri.so
-
-include ../Makefile.defines
-
-RADEON_COMMON_SOURCES = \
-	radeon_buffer_objects.c \
-	radeon_common_context.c \
-	radeon_common.c \
-	radeon_dma.c \
-	radeon_debug.c \
-	radeon_fbo.c \
-	radeon_mipmap_tree.c \
-	radeon_pixel_read.c \
-	radeon_queryobj.c \
-	radeon_span.c \
-	radeon_texture.c \
-	radeon_tex_copy.c \
-	radeon_tile.c \
-	radeon_fog.c
-
-DRIVER_SOURCES = r200_context.c \
-		 r200_ioctl.c \
-		 r200_state.c \
-		 r200_state_init.c \
-		 r200_cmdbuf.c \
-		 r200_tex.c \
-		 r200_texstate.c \
-		 r200_tcl.c \
-		 r200_swtcl.c \
-		 r200_maos.c \
-		 r200_sanity.c \
-		 r200_fragshader.c \
-		 r200_vertprog.c \
-		 r200_blit.c \
-		 radeon_screen.c \
-		 $(RADEON_COMMON_SOURCES)
-
-C_SOURCES = $(COMMON_SOURCES) $(DRIVER_SOURCES)
-
-X86_SOURCES = 
-
-DRIVER_DEFINES = -DRADEON_R200
-
-INCLUDES += $(RADEON_CFLAGS)
-DRI_LIB_DEPS += $(RADEON_LIBS)
-
-##### TARGETS #####
-
-
-include ../Makefile.targets
-
-#INCLUDES += -I../radeon/server
-
diff --git a/src/mesa/drivers/dri/r200/Makefile.am b/src/mesa/drivers/dri/r200/Makefile.am
new file mode 100644
index 0000000..e83c5b7
--- /dev/null
+++ b/src/mesa/drivers/dri/r200/Makefile.am
@@ -0,0 +1,61 @@
+
+
+# Copyright © 2012 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_CFLAGS = \
+	-DRADEON_R200 \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/src/ \
+	-I$(top_srcdir)/src/mapi \
+	-I$(top_srcdir)/src/mesa/ \
+	-I$(top_srcdir)/src/mesa/drivers/dri/common \
+	-I$(top_srcdir)/src/mesa/drivers/dri/r200/server \
+	$(DEFINES) \
+	$(ASM_FLAGS) \
+	$(API_DEFINES) \
+	$(RADEON_CFLAGS)
+
+dridir = $(DRI_DRIVER_INSTALL_DIR)
+
+if HAVE_R200_DRI
+dri_LTLIBRARIES = r200_dri.la
+endif
+
+r200_dri_la_SOURCES = \
+        $(R200_C_FILES)
+
+r200_dri_la_LDFLAGS = -module -avoid-version -shared
+r200_dri_la_LIBADD = \
+	$(DRI_LIB_DEPS) \
+	$(DRICORE_LIB_DEPS) \
+	$(RADEON_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: r200_dri.la
+	$(MKDIR_P) $(top_builddir)/$(LIB_DIR);
+	ln -f .libs/r200_dri.so $(top_builddir)/$(LIB_DIR)/r200_dri.so;
diff --git a/src/mesa/drivers/dri/r200/Makefile.sources b/src/mesa/drivers/dri/r200/Makefile.sources
new file mode 100644
index 0000000..1bc75d1
--- /dev/null
+++ b/src/mesa/drivers/dri/r200/Makefile.sources
@@ -0,0 +1,34 @@
+R200_COMMON_FILES = \
+	radeon_buffer_objects.c \
+	radeon_common_context.c \
+	radeon_common.c \
+	radeon_dma.c \
+	radeon_debug.c \
+	radeon_fbo.c \
+	radeon_fog.c \
+	radeon_mipmap_tree.c \
+	radeon_pixel_read.c \
+	radeon_queryobj.c \
+	radeon_span.c \
+	radeon_texture.c \
+	radeon_tex_copy.c \
+	radeon_tile.c
+
+DRIVER_FILES = \
+	r200_context.c \
+	r200_ioctl.c \
+	r200_state.c \
+	r200_state_init.c \
+	r200_cmdbuf.c \
+	r200_tex.c \
+	r200_texstate.c \
+	r200_tcl.c \
+	r200_swtcl.c \
+	r200_maos.c \
+	r200_sanity.c \
+	r200_fragshader.c \
+	r200_vertprog.c \
+	r200_blit.c \
+	radeon_screen.c
+
+R200_C_FILES = $(R200_COMMON_FILES) $(DRIVER_FILES)

More information about the mesa-commit mailing list