diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/nv_const.h | 3 | ||||
| -rw-r--r-- | src/riva_const.h | 3 | ||||
| -rw-r--r-- | src/riva_driver.c | 2 |
5 files changed, 22 insertions, 7 deletions
@@ -1,3 +1,14 @@ +2006-05-24 Aaron Plattner <aplattner@nvidia.com> + + * configure.ac: + * src/nv_const.h: + * src/riva_const.h: + Derive the module version numbers from the package version. This idea was + lifted from Michel Dänzer's similar code in xf86-video-ati. + + * src/riva_driver.c: + Make the riva and nv driver versions match. + 2006-04-27 Aaron Plattner <aplattner@nvidia.com> * configure.ac: diff --git a/configure.ac b/configure.ac index 31637e8..a44f78b 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,16 @@ AC_INIT([xf86-video-nv], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-video-nv) +AC_DEFINE_UNQUOTED([NV_MAJOR_VERSION], + [$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]]\)\.[[0-9]]\.[[0-9]]/\1/')], + [Major version]) +AC_DEFINE_UNQUOTED([NV_MINOR_VERSION], + [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.\([[0-9]]\)\.[[0-9]]/\1/')], + [Minor version]) +AC_DEFINE_UNQUOTED([NV_PATCHLEVEL], + [$(echo $PACKAGE_VERSION | sed -e 's/^[[0-9]]\.[[0-9]]\.\([[0-9]]\)/\1/')], + [Patch version]) + AC_CONFIG_SRCDIR([Makefile.am]) AM_CONFIG_HEADER([config.h]) AC_CONFIG_AUX_DIR(.) diff --git a/src/nv_const.h b/src/nv_const.h index 523c7ee..7a7bdea 100644 --- a/src/nv_const.h +++ b/src/nv_const.h @@ -6,9 +6,6 @@ #define NV_VERSION 4000 #define NV_NAME "NV" #define NV_DRIVER_NAME "nv" -#define NV_MAJOR_VERSION 1 -#define NV_MINOR_VERSION 1 -#define NV_PATCHLEVEL 2 #endif /* __NV_CONST_H__ */ diff --git a/src/riva_const.h b/src/riva_const.h index 8221dca..4949fc1 100644 --- a/src/riva_const.h +++ b/src/riva_const.h @@ -6,9 +6,6 @@ #define RIVA_VERSION 4000 #define RIVA_NAME "RIVA128" #define RIVA_DRIVER_NAME "riva128" -#define RIVA_MAJOR_VERSION 1 -#define RIVA_MINOR_VERSION 1 -#define RIVA_PATCHLEVEL 0 #endif /* __RIVA_CONST_H__ */ diff --git a/src/riva_driver.c b/src/riva_driver.c index c5e6ea0..e062995 100644 --- a/src/riva_driver.c +++ b/src/riva_driver.c @@ -177,7 +177,7 @@ static XF86ModuleVersionInfo rivaVersRec = MODINFOSTRING1, MODINFOSTRING2, XORG_VERSION_CURRENT, - RIVA_MAJOR_VERSION, RIVA_MINOR_VERSION, RIVA_PATCHLEVEL, + NV_MAJOR_VERSION, NV_MINOR_VERSION, NV_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, MOD_CLASS_VIDEODRV, |