Permalink
Browse files

Rename module from nv_drv.so to nouveau_drv.so to allow both nv and n…

…ouveau

to coexist.  Also disabled building of riva128.so, as we plan on merging it
with the rest of the nv code.
  • Loading branch information...
1 parent 17c871a commit 03b86f08667a10c44420d60787fe9e17b5d20ab8 Ben Skeggs committed Aug 31, 2006
Showing with 39 additions and 39 deletions.
  1. +3 −3 configure.ac
  2. +2 −2 man/.gitignore
  3. 0 man/{nv.man → nouveau.man}
  4. +27 −27 src/Makefile.am
  5. +2 −2 src/nv_const.h
  6. +5 −5 src/nv_driver.c
View
@@ -21,10 +21,10 @@
# Process this file with autoconf to produce a configure script
AC_PREREQ(2.57)
-AC_INIT([xf86-video-nv],
+AC_INIT([xf86-video-nouveau],
1.2.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- xf86-video-nv)
+ xf86-video-nouveau)
AC_DEFINE_UNQUOTED([NV_MAJOR_VERSION],
[$(echo $PACKAGE_VERSION | sed -e 's/^\([[0-9]]\)\.[[0-9]]\.[[0-9]]/\1/')],
@@ -85,7 +85,7 @@ AC_SUBST([CFLAGS])
AC_SUBST([XORG_CFLAGS])
AC_SUBST([moduledir])
-DRIVER_NAME=nv
+DRIVER_NAME=nouveau
AC_SUBST([DRIVER_NAME])
XORG_MANPAGE_SECTIONS
View
@@ -1,2 +1,2 @@
-nv.4
-nv.4x
+nouveau.4
+nouveau.4x
File renamed without changes.
View
@@ -24,19 +24,19 @@
# _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@
-nv_drv_la_LTLIBRARIES = nv_drv.la
-nv_drv_la_LDFLAGS = -module -avoid-version
-nv_drv_ladir = @moduledir@/drivers
+nouveau_drv_la_LTLIBRARIES = nouveau_drv.la
+nouveau_drv_la_LDFLAGS = -module -avoid-version
+nouveau_drv_ladir = @moduledir@/drivers
-nv_drv_la_SOURCES = \
- nv_bios.c \
+nouveau_drv_la_SOURCES = \
+ nv_bios.c \
nv_const.h \
nv_cursor.c \
nv_dac.c \
- nv_dma.c \
+ nv_dma.c \
nv_dma.h \
- nv_dri.c \
- nv_exa.c \
+ nv_dri.c \
+ nv_exa.c \
nv_driver.c \
nv_hw.c \
nv_include.h \
@@ -50,23 +50,23 @@ 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_LTLIBRARIES = riva128.la
+#riva128_la_LDFLAGS = -module -avoid-version
+#riva128_ladir = @moduledir@/drivers
-riva128_la_SOURCES = \
- 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
+#riva128_la_SOURCES = \
+# 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
View
@@ -4,8 +4,8 @@
#define __NV_CONST_H__
#define NV_VERSION 4000
-#define NV_NAME "NV"
-#define NV_DRIVER_NAME "nv"
+#define NV_NAME "NOUVEAU"
+#define NV_DRIVER_NAME "nouveau"
#endif /* __NV_CONST_H__ */
View
@@ -469,11 +469,11 @@ const char *driSymbols[] = {
#endif
-static MODULESETUPPROTO(nvSetup);
+static MODULESETUPPROTO(nouveauSetup);
-static XF86ModuleVersionInfo nvVersRec =
+static XF86ModuleVersionInfo nouveauVersRec =
{
- "nv",
+ "nouveau",
MODULEVENDORSTRING,
MODINFOSTRING1,
MODINFOSTRING2,
@@ -485,7 +485,7 @@ static XF86ModuleVersionInfo nvVersRec =
{0,0,0,0}
};
-_X_EXPORT XF86ModuleData nvModuleData = { &nvVersRec, nvSetup, NULL };
+_X_EXPORT XF86ModuleData nouveauModuleData = { &nouveauVersRec, nouveauSetup, NULL };
typedef enum {
@@ -609,7 +609,7 @@ NVFreeRec(ScrnInfoPtr pScrn)
static pointer
-nvSetup(pointer module, pointer opts, int *errmaj, int *errmin)
+nouveauSetup(pointer module, pointer opts, int *errmaj, int *errmin)
{
static Bool setupDone = FALSE;

0 comments on commit 03b86f0

Please sign in to comment.