update xf86-video-nv to 2.1.10

1 files changed, 45 insertions, 9 deletions

diff --git a/driver/xf86-video-nv/src/Makefile.am b/driver/xf86-video-nv/src/Makefile.am
index 73667b358..2677d9c70 100644
--- a/driver/xf86-video-nv/src/Makefile.am
+++ b/driver/xf86-video-nv/src/Makefile.am
@@ -23,12 +23,14 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
-AM_CFLAGS = @XORG_CFLAGS@
+AM_CFLAGS = @XMODES_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 \
@@ -39,19 +41,13 @@ nv_drv_la_SOURCES = \
          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
 
-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 \
@@ -67,3 +63,43 @@ riva128_la_SOURCES = \
          riva_tbl.h \
          riva_type.h \
          riva_xaa.c
+
+g80_sources = \
+         g80_cursor.c \
+         g80_cursor.h \
+         g80_dac.c \
+         g80_display.c \
+         g80_display.h \
+         g80_dma.c \
+         g80_dma.h \
+         g80_driver.c \
+         g80_exa.c \
+         g80_exa.h \
+         g80_output.c \
+         g80_output.h \
+         g80_sor.c \
+         g80_type.h \
+         g80_xaa.c \
+         g80_xaa.h
+
+xmode_sources = \
+         @parser_dir@/xf86Parser.h \
+         @parser_dir@/xf86Optrec.h \
+         @modes_dir@/xf86Modes.h \
+         @modes_dir@/xf86Modes.c \
+         @modes_dir@/xf86cvt.c \
+         @modes_dir@/xf86Crtc.h \
+         @modes_dir@/xf86Crtc.c \
+         @modes_dir@/xf86Cursors.c \
+         @modes_dir@/xf86EdidModes.c \
+         @modes_dir@/xf86gtf.c \
+         @modes_dir@/xf86RandR12.c \
+         @modes_dir@/xf86RandR12.h \
+         @modes_dir@/xf86Rename.h \
+         @modes_dir@/xf86Rotate.c \
+         @modes_dir@/xf86DiDGA.c
+
+if BUILD_XMODES
+EXTRA_nv_drv_la_SOURCES = local_xf86Rename.h
+nodist_nv_drv_la_SOURCES = $(xmode_sources)
+endif