sync

7 files changed, 257 insertions, 139 deletions

diff --git a/driver/xf86-video-nv/Makefile.in b/driver/xf86-video-nv/Makefile.in
index 149a2791d..4e2f9d80f 100644
--- a/driver/xf86-video-nv/Makefile.in
+++ b/driver/xf86-video-nv/Makefile.in
@@ -160,6 +160,8 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SUPPORT_G80_FALSE = @SUPPORT_G80_FALSE@
+SUPPORT_G80_TRUE = @SUPPORT_G80_TRUE@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
@@ -210,7 +212,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src man
-EXTRA_DIST = README.NV1 ChangeLog
+EXTRA_DIST = README.NV1 README.G80 ChangeLog
 CLEANFILES = ChangeLog
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff --git a/driver/xf86-video-nv/aclocal.m4 b/driver/xf86-video-nv/aclocal.m4
index 02853bfab..8afe0fc83 100644
--- a/driver/xf86-video-nv/aclocal.m4
+++ b/driver/xf86-video-nv/aclocal.m4
@@ -6429,7 +6429,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
 if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
+	_pkg_min_version=m4_default([$1], [0.9.0])
 	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
 		AC_MSG_RESULT([yes])
@@ -6465,14 +6465,30 @@ fi])
 # ---------------------------------------------
 m4_define([_PKG_CONFIG],
 [if test -n "$PKG_CONFIG"; then
+    if test -n "$$1"; then
+        pkg_cv_[]$1="$$1"
+    else
         PKG_CHECK_EXISTS([$3],
                          [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
 			 [pkg_failed=yes])
+    fi
 else
 	pkg_failed=untried
 fi[]dnl
 ])# _PKG_CONFIG
 
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
 # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
 # [ACTION-IF-NOT-FOUND])
 #
@@ -6494,29 +6510,39 @@ AC_MSG_CHECKING([for $1])
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
 
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
 if test $pkg_failed = yes; then
-	$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+        fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
 	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met.
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details.])],
-		[$4])
+_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $4])
 elif test $pkg_failed = untried; then
 	ifelse([$4], , [AC_MSG_FAILURE(dnl
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details.
+_PKG_TEXT
 
 To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
 		[$4])
diff --git a/driver/xf86-video-nv/configure b/driver/xf86-video-nv/configure
index 01d6a4f5e..4da202fa6 100644
--- a/driver/xf86-video-nv/configure
+++ b/driver/xf86-video-nv/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for xf86-video-nv 1.2.2.1.
+# Generated by GNU Autoconf 2.59 for xf86-video-nv 2.0.2.
 #
 # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='xf86-video-nv'
 PACKAGE_TARNAME='xf86-video-nv'
-PACKAGE_VERSION='1.2.2.1'
-PACKAGE_STRING='xf86-video-nv 1.2.2.1'
+PACKAGE_VERSION='2.0.2'
+PACKAGE_STRING='xf86-video-nv 2.0.2'
 PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
 
 ac_unique_file="Makefile.am"
@@ -465,7 +465,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG XORG_CFLAGS XORG_LIBS moduledir DRIVER_NAME APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG XORG_CFLAGS XORG_LIBS SUPPORT_G80_TRUE SUPPORT_G80_FALSE moduledir DRIVER_NAME APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -966,7 +966,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures xf86-video-nv 1.2.2.1 to adapt to many kinds of systems.
+\`configure' configures xf86-video-nv 2.0.2 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1032,7 +1032,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of xf86-video-nv 1.2.2.1:";;
+     short | recursive ) echo "Configuration of xf86-video-nv 2.0.2:";;
    esac
   cat <<\_ACEOF
 
@@ -1050,6 +1050,7 @@ Optional Features:
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
   --disable-libtool-lock  avoid locking (might break parallel builds)
+  --disable-g80           Disable G80 support [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -1181,7 +1182,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-xf86-video-nv configure 1.2.2.1
+xf86-video-nv configure 2.0.2
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1195,7 +1196,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by xf86-video-nv $as_me 1.2.2.1, which was
+It was created by xf86-video-nv $as_me 2.0.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1843,7 +1844,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='xf86-video-nv'
- VERSION='1.2.2.1'
+ VERSION='2.0.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3725,7 +3726,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3728 "configure"' > conftest.$ac_ext
+  echo '#line 3729 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -5324,7 +5325,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:5327:" \
+echo "$as_me:5328:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6387,11 +6388,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6390: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6391: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6394: \$? = $ac_status" >&5
+   echo "$as_me:6395: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6655,11 +6656,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6658: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6659: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6662: \$? = $ac_status" >&5
+   echo "$as_me:6663: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -6759,11 +6760,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6762: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6763: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6766: \$? = $ac_status" >&5
+   echo "$as_me:6767: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9108,7 +9109,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9111 "configure"
+#line 9112 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9208,7 +9209,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 9211 "configure"
+#line 9212 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11552,11 +11553,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11555: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11556: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11559: \$? = $ac_status" >&5
+   echo "$as_me:11560: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -11656,11 +11657,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11659: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11660: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11663: \$? = $ac_status" >&5
+   echo "$as_me:11664: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13226,11 +13227,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13229: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13230: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13233: \$? = $ac_status" >&5
+   echo "$as_me:13234: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13330,11 +13331,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13333: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13334: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13337: \$? = $ac_status" >&5
+   echo "$as_me:13338: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15537,11 +15538,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15540: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15541: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15544: \$? = $ac_status" >&5
+   echo "$as_me:15545: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15805,11 +15806,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15808: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15809: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15812: \$? = $ac_status" >&5
+   echo "$as_me:15813: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15909,11 +15910,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15912: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15913: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15916: \$? = $ac_status" >&5
+   echo "$as_me:15917: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -19807,6 +19808,19 @@ _ACEOF
 
 fi
 
+if test -n "$PKG_CONFIG" && \
+    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server >= 1.1.99.901\"") >&5
+  ($PKG_CONFIG --exists --print-errors "xorg-server >= 1.1.99.901") 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_CVTMODE_FUNC 1
+_ACEOF
+
+fi
+
 # Checks for pkg-config packages
 
 pkg_failed=no
@@ -19814,6 +19828,9 @@ echo "$as_me:$LINENO: checking for XORG" >&5
 echo $ECHO_N "checking for XORG... $ECHO_C" >&6
 
 if test -n "$PKG_CONFIG"; then
+    if test -n "$XORG_CFLAGS"; then
+        pkg_cv_XORG_CFLAGS="$XORG_CFLAGS"
+    else
         if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5
   ($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES") 2>&5
@@ -19824,10 +19841,14 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
+    fi
 else
 	pkg_failed=untried
 fi
 if test -n "$PKG_CONFIG"; then
+    if test -n "$XORG_LIBS"; then
+        pkg_cv_XORG_LIBS="$XORG_LIBS"
+    else
         if test -n "$PKG_CONFIG" && \
     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"xorg-server xproto fontsproto \$REQUIRED_MODULES\"") >&5
   ($PKG_CONFIG --exists --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES") 2>&5
@@ -19838,38 +19859,59 @@ if test -n "$PKG_CONFIG"; then
 else
   pkg_failed=yes
 fi
+    fi
 else
 	pkg_failed=untried
 fi
 
+
+
 if test $pkg_failed = yes; then
-	XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES"`
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        XORG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES"`
+        else
+	        XORG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xorg-server xproto fontsproto $REQUIRED_MODULES"`
+        fi
 	# Put the nasty error message in config.log where it belongs
-	echo "$XORG_PKG_ERRORS" 1>&5
+	echo "$XORG_PKG_ERRORS" >&5
+
+	{ { echo "$as_me:$LINENO: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met:
+
+$XORG_PKG_ERRORS
 
-	{ { echo "$as_me:$LINENO: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met.
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively you may set the XORG_CFLAGS and XORG_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details." >&5
-echo "$as_me: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met.
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&5
+echo "$as_me: error: Package requirements (xorg-server xproto fontsproto $REQUIRED_MODULES) were not met:
+
+$XORG_PKG_ERRORS
+
 Consider adjusting the PKG_CONFIG_PATH environment variable if you
 installed software in a non-standard prefix.
 
-Alternatively you may set the XORG_CFLAGS and XORG_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details." >&2;}
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+" >&2;}
    { (exit 1); exit 1; }; }
 elif test $pkg_failed = untried; then
 	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-Alternatively you may set the XORG_CFLAGS and XORG_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details.
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
 
 To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 See \`config.log' for more details." >&5
@@ -19877,9 +19919,9 @@ echo "$as_me: error: The pkg-config script could not be found or is too old.  Ma
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
 
-Alternatively you may set the XORG_CFLAGS and XORG_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details.
+Alternatively, you may set the environment variables XORG_CFLAGS
+and XORG_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
 
 To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
 See \`config.log' for more details." >&2;}
@@ -19893,6 +19935,33 @@ echo "${ECHO_T}yes" >&6
 fi
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
 
+# Check for optional compile-time support
+# Check whether --enable-g80 or --disable-g80 was given.
+if test "${enable_g80+set}" = set; then
+  enableval="$enable_g80"
+  SUPPORT_G80="$enableval"
+else
+  SUPPORT_G80=yes
+fi;
+
+
+if test x$SUPPORT_G80 = xyes; then
+  SUPPORT_G80_TRUE=
+  SUPPORT_G80_FALSE='#'
+else
+  SUPPORT_G80_TRUE='#'
+  SUPPORT_G80_FALSE=
+fi
+
+if test "$SUPPORT_G80" = yes; then
+
+cat >>confdefs.h <<\_ACEOF
+#define SUPPORT_G80 1
+_ACEOF
+
+        echo "Enabling G80 support"
+fi
+
 # Checks for libraries.
 
 # Checks for header files.
@@ -20307,6 +20376,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${SUPPORT_G80_TRUE}" && test -z "${SUPPORT_G80_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"SUPPORT_G80\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"SUPPORT_G80\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -20578,7 +20654,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by xf86-video-nv $as_me 1.2.2.1, which was
+This file was extended by xf86-video-nv $as_me 2.0.2, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20641,7 +20717,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-xf86-video-nv config.status 1.2.2.1
+xf86-video-nv config.status 2.0.2
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -20913,6 +20989,8 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t
 s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@XORG_CFLAGS@,$XORG_CFLAGS,;t t
 s,@XORG_LIBS@,$XORG_LIBS,;t t
+s,@SUPPORT_G80_TRUE@,$SUPPORT_G80_TRUE,;t t
+s,@SUPPORT_G80_FALSE@,$SUPPORT_G80_FALSE,;t t
 s,@moduledir@,$moduledir,;t t
 s,@DRIVER_NAME@,$DRIVER_NAME,;t t
 s,@APP_MAN_SUFFIX@,$APP_MAN_SUFFIX,;t t
diff --git a/driver/xf86-video-nv/ltmain.sh b/driver/xf86-video-nv/ltmain.sh
index ef5ee686b..25f21fea7 100644
--- a/driver/xf86-video-nv/ltmain.sh
+++ b/driver/xf86-video-nv/ltmain.sh
@@ -5822,6 +5822,10 @@ relink_command=\"$relink_command\""
       esac
       install_prog="$install_prog $arg"
     done
+    case " $install_prog " in
+    *[\\\ /]cp\ *) extra_mode=;;
+    *) extra_mode='-m 644';;
+    esac
 
     if test -z "$install_prog"; then
       $echo "$modename: you must specify an install program" 1>&2
@@ -5976,8 +5980,8 @@ relink_command=\"$relink_command\""
 	  test -n "$relink_command" && srcname="$realname"T
 
 	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+	  $show "$install_prog $extra_mode $dir/$srcname $destdir/$realname"
+	  $run eval "$install_prog $extra_mode $dir/$srcname $destdir/$realname" || exit $?
 	  if test -n "$stripme" && test -n "$striplib"; then
 	    $show "$striplib $destdir/$realname"
 	    $run eval "$striplib $destdir/$realname" || exit $?
@@ -6022,8 +6026,8 @@ relink_command=\"$relink_command\""
 	# Install the pseudo-library for information purposes.
 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
 	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
+	$show "$install_prog $extra_mode $instname $destdir/$name"
+	$run eval "$install_prog $extra_mode $instname $destdir/$name" || exit $?
 
 	# Maybe install the static library, too.
 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
@@ -6058,8 +6062,8 @@ relink_command=\"$relink_command\""
 
 	# Install the libtool object if requested.
 	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
+	  $show "$install_prog $extra_mode $file $destfile"
+	  $run eval "$install_prog $extra_mode $file $destfile" || exit $?
 	fi
 
 	# Install the old object if enabled.
@@ -6067,8 +6071,8 @@ relink_command=\"$relink_command\""
 	  # Deduce the name of the old-style object file.
 	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
 
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+	  $show "$install_prog $extra_mode $staticobj $staticdest"
+	  $run eval "$install_prog $extra_mode \$staticobj \$staticdest" || exit $?
 	fi
 	exit $EXIT_SUCCESS
 	;;
diff --git a/driver/xf86-video-nv/man/Makefile.am b/driver/xf86-video-nv/man/Makefile.am
index f0eb29b85..74d98bb7a 100644
--- a/driver/xf86-video-nv/man/Makefile.am
+++ b/driver/xf86-video-nv/man/Makefile.am
@@ -40,6 +40,12 @@ SED = sed
 XORGRELSTRING = @PACKAGE_STRING@
   XORGMANNAME = X Version 11
 
+if SUPPORT_G80
+MAN_SUPPORT_G80 = 1
+else
+MAN_SUPPORT_G80 = 0
+endif
+
 MAN_SUBSTS = \
 	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
 	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
@@ -50,7 +56,8 @@ MAN_SUBSTS = \
 	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
 	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
 	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
+	-e 's|__support_g80__|$(MAN_SUPPORT_G80)|g'
 
 SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
 
diff --git a/driver/xf86-video-nv/man/Makefile.in b/driver/xf86-video-nv/man/Makefile.in
index e9c0e3cbc..663811a32 100644
--- a/driver/xf86-video-nv/man/Makefile.in
+++ b/driver/xf86-video-nv/man/Makefile.in
@@ -152,6 +152,8 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SUPPORT_G80_FALSE = @SUPPORT_G80_FALSE@
+SUPPORT_G80_TRUE = @SUPPORT_G80_TRUE@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
@@ -210,6 +212,8 @@ SED = sed
 # Strings to replace in man pages
 XORGRELSTRING = @PACKAGE_STRING@
 XORGMANNAME = X Version 11
+@SUPPORT_G80_FALSE@MAN_SUPPORT_G80 = 0
+@SUPPORT_G80_TRUE@MAN_SUPPORT_G80 = 1
 MAN_SUBSTS = \
 	-e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
 	-e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
@@ -220,7 +224,8 @@ MAN_SUBSTS = \
 	-e 's|__drivermansuffix__|$(DRIVER_MAN_SUFFIX)|g' \
 	-e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
 	-e 's|__miscmansuffix__|$(MISC_MAN_SUFFIX)|g' \
-	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
+	-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
+	-e 's|__support_g80__|$(MAN_SUPPORT_G80)|g'
 
 SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
 all: all-am
diff --git a/driver/xf86-video-nv/src/Makefile.in b/driver/xf86-video-nv/src/Makefile.in
index 6025fe3af..b4b7bc0c1 100644
--- a/driver/xf86-video-nv/src/Makefile.in
+++ b/driver/xf86-video-nv/src/Makefile.in
@@ -71,20 +71,29 @@ am__vpath_adj = case $$p in \
     *) f=$$p;; \
   esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(nv_drv_ladir)" \
-	"$(DESTDIR)$(riva128_ladir)"
+am__installdirs = "$(DESTDIR)$(nv_drv_ladir)"
 nv_drv_laLTLIBRARIES_INSTALL = $(INSTALL)
-riva128_laLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(nv_drv_la_LTLIBRARIES) $(riva128_la_LTLIBRARIES)
+LTLIBRARIES = $(nv_drv_la_LTLIBRARIES)
 nv_drv_la_LIBADD =
-am_nv_drv_la_OBJECTS = nv_cursor.lo nv_dac.lo nv_dga.lo nv_driver.lo \
-	nv_hw.lo nv_setup.lo nv_shadow.lo nv_video.lo nv_xaa.lo
+am__nv_drv_la_SOURCES_DIST = nv_const.h nv_cursor.c nv_dac.c nv_dga.c \
+	nv_dma.h nv_driver.c nv_hw.c nv_include.h nv_local.h \
+	nv_proto.h nvreg.h nv_setup.c nv_shadow.c nv_type.h nvvga.h \
+	nv_video.c nv_xaa.c riva_const.h riva_cursor.c riva_dac.c \
+	riva_dga.c riva_driver.c riva_hw.c riva_hw.h riva_include.h \
+	riva_local.h riva_proto.h riva_setup.c riva_shadow.c \
+	riva_tbl.h riva_type.h riva_xaa.c g80_cursor.c g80_cursor.h \
+	g80_ddc.c g80_ddc.h g80_display.c g80_display.h g80_dma.c \
+	g80_dma.h g80_driver.c g80_type.h g80_xaa.c g80_xaa.h
+am__objects_1 = nv_cursor.lo nv_dac.lo nv_dga.lo nv_driver.lo nv_hw.lo \
+	nv_setup.lo nv_shadow.lo nv_video.lo nv_xaa.lo
+am__objects_2 = riva_cursor.lo riva_dac.lo riva_dga.lo riva_driver.lo \
+	riva_hw.lo riva_setup.lo riva_shadow.lo riva_xaa.lo
+@SUPPORT_G80_TRUE@am__objects_3 = g80_cursor.lo g80_ddc.lo \
+@SUPPORT_G80_TRUE@	g80_display.lo g80_dma.lo g80_driver.lo \
+@SUPPORT_G80_TRUE@	g80_xaa.lo
+am_nv_drv_la_OBJECTS = $(am__objects_1) $(am__objects_2) \
+	$(am__objects_3)
 nv_drv_la_OBJECTS = $(am_nv_drv_la_OBJECTS)
-riva128_la_LIBADD =
-am_riva128_la_OBJECTS = riva_cursor.lo riva_dac.lo riva_dga.lo \
-	riva_driver.lo riva_hw.lo riva_setup.lo riva_shadow.lo \
-	riva_xaa.lo
-riva128_la_OBJECTS = $(am_riva128_la_OBJECTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -96,8 +105,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(nv_drv_la_SOURCES) $(riva128_la_SOURCES)
-DIST_SOURCES = $(nv_drv_la_SOURCES) $(riva128_la_SOURCES)
+SOURCES = $(nv_drv_la_SOURCES)
+DIST_SOURCES = $(am__nv_drv_la_SOURCES_DIST)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -170,6 +179,8 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
+SUPPORT_G80_FALSE = @SUPPORT_G80_FALSE@
+SUPPORT_G80_TRUE = @SUPPORT_G80_TRUE@
 VERSION = @VERSION@
 XORG_CFLAGS = @XORG_CFLAGS@
 XORG_LIBS = @XORG_LIBS@
@@ -228,7 +239,8 @@ AM_CFLAGS = @XORG_CFLAGS@
 nv_drv_la_LTLIBRARIES = nv_drv.la
 nv_drv_la_LDFLAGS = -module -avoid-version
 nv_drv_ladir = @moduledir@/drivers
-nv_drv_la_SOURCES = \
+nv_drv_la_SOURCES = $(nv_sources) $(riva_sources) $(g80_sources)
+nv_sources = \
          nv_const.h \
          nv_cursor.c \
          nv_dac.c \
@@ -247,10 +259,7 @@ nv_drv_la_SOURCES = \
          nv_video.c \
          nv_xaa.c
 
-riva128_la_LTLIBRARIES = riva128.la
-riva128_la_LDFLAGS = -module -avoid-version
-riva128_ladir = @moduledir@/drivers
-riva128_la_SOURCES = \
+riva_sources = \
          riva_const.h \
          riva_cursor.c \
          riva_dac.c \
@@ -267,6 +276,20 @@ riva128_la_SOURCES = \
          riva_type.h \
          riva_xaa.c
 
+@SUPPORT_G80_TRUE@g80_sources = \
+@SUPPORT_G80_TRUE@         g80_cursor.c \
+@SUPPORT_G80_TRUE@         g80_cursor.h \
+@SUPPORT_G80_TRUE@         g80_ddc.c \
+@SUPPORT_G80_TRUE@         g80_ddc.h \
+@SUPPORT_G80_TRUE@         g80_display.c \
+@SUPPORT_G80_TRUE@         g80_display.h \
+@SUPPORT_G80_TRUE@         g80_dma.c \
+@SUPPORT_G80_TRUE@         g80_dma.h \
+@SUPPORT_G80_TRUE@         g80_driver.c \
+@SUPPORT_G80_TRUE@         g80_type.h \
+@SUPPORT_G80_TRUE@         g80_xaa.c \
+@SUPPORT_G80_TRUE@         g80_xaa.h
+
 all: all-am
 
 .SUFFIXES:
@@ -327,37 +350,8 @@ clean-nv_drv_laLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-install-riva128_laLTLIBRARIES: $(riva128_la_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(riva128_ladir)" || $(mkdir_p) "$(DESTDIR)$(riva128_ladir)"
-	@list='$(riva128_la_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(riva128_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(riva128_ladir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(riva128_laLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(riva128_ladir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-riva128_laLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(riva128_la_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(riva128_ladir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(riva128_ladir)/$$p"; \
-	done
-
-clean-riva128_laLTLIBRARIES:
-	-test -z "$(riva128_la_LTLIBRARIES)" || rm -f $(riva128_la_LTLIBRARIES)
-	@list='$(riva128_la_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
 nv_drv.la: $(nv_drv_la_OBJECTS) $(nv_drv_la_DEPENDENCIES) 
 	$(LINK) -rpath $(nv_drv_ladir) $(nv_drv_la_LDFLAGS) $(nv_drv_la_OBJECTS) $(nv_drv_la_LIBADD) $(LIBS)
-riva128.la: $(riva128_la_OBJECTS) $(riva128_la_DEPENDENCIES) 
-	$(LINK) -rpath $(riva128_ladir) $(riva128_la_LDFLAGS) $(riva128_la_OBJECTS) $(riva128_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -365,6 +359,12 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c
 
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_cursor.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_ddc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_display.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_dma.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_driver.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/g80_xaa.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nv_cursor.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nv_dac.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nv_dga.Plo@am__quote@
@@ -493,7 +493,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
-	for dir in "$(DESTDIR)$(nv_drv_ladir)" "$(DESTDIR)$(riva128_ladir)"; do \
+	for dir in "$(DESTDIR)$(nv_drv_ladir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -523,7 +523,7 @@ maintainer-clean-generic:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-nv_drv_laLTLIBRARIES \
-	clean-riva128_laLTLIBRARIES mostlyclean-am
+	mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR)
@@ -541,8 +541,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-nv_drv_laLTLIBRARIES \
-	install-riva128_laLTLIBRARIES
+install-data-am: install-nv_drv_laLTLIBRARIES
 
 install-exec-am:
 
@@ -570,23 +569,20 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-info-am uninstall-nv_drv_laLTLIBRARIES \
-	uninstall-riva128_laLTLIBRARIES
+uninstall-am: uninstall-info-am uninstall-nv_drv_laLTLIBRARIES
 
 .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-nv_drv_laLTLIBRARIES \
-	clean-riva128_laLTLIBRARIES ctags distclean distclean-compile \
-	distclean-generic distclean-libtool distclean-tags distdir dvi \
-	dvi-am html html-am info info-am install install-am \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man \
-	install-nv_drv_laLTLIBRARIES install-riva128_laLTLIBRARIES \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic mostlyclean \
-	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
-	pdf pdf-am ps ps-am tags uninstall uninstall-am \
-	uninstall-info-am uninstall-nv_drv_laLTLIBRARIES \
-	uninstall-riva128_laLTLIBRARIES
+	clean-libtool clean-nv_drv_laLTLIBRARIES ctags distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-nv_drv_laLTLIBRARIES install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-info-am \
+	uninstall-nv_drv_laLTLIBRARIES
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.