Permalink
Browse files

Derive the module version numbers from the package version. This idea…

… was

lifted from Michel Dänzer's similar code in xf86-video-ati.

Also, make the riva and nv driver versions match.
  • Loading branch information...
1 parent 1a40c4a commit eda3bac20dce2d5584ac07cc6b28a08ec55aa798 @aaronp24 aaronp24 committed May 24, 2006
Showing with 22 additions and 7 deletions.
  1. +11 −0 ChangeLog
  2. +10 −0 configure.ac
  3. +0 −3 src/nv_const.h
  4. +0 −3 src/riva_const.h
  5. +1 −1 src/riva_driver.c
View
@@ -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:
View
@@ -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(.)
View
@@ -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__ */
View
@@ -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__ */
View
@@ -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,

0 comments on commit eda3bac

Please sign in to comment.