frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hw/kdrive/*/Makefile.am Libraries in local dir must not use global path or 

make doesn't build things in the right order (-j)
hw/kdrive/mga/mga.h, mgadraw.c Fix warnings
This commit is contained in:
Keith Packard 2003-10-15 04:59:45 +00:00
parent b3e47ce18f
commit f5916edb17
9 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/kdrive/fbdev/Makefile.am
View File

@ -19,7 +19,7 @@ Xfbdev_SOURCES = \
fbinit.c fbinit.c
Xfbdev_LDADD = \ Xfbdev_LDADD = \
$(top_builddir)/hw/kdrive/fbdev/libfbdev.a \ libfbdev.a \
$(top_builddir)/dix/libdix.a \ $(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \ $(top_builddir)/os/libos.a \
$(top_builddir)/miext/layer/liblayer.a \ $(top_builddir)/miext/layer/liblayer.a \

2
hw/kdrive/mach64/Makefile.am
View File

@ -27,7 +27,7 @@ Xmach64_SOURCES = \
mach64stub.c mach64stub.c
Xmach64_LDADD = \ Xmach64_LDADD = \
$(top_builddir)/hw/kdrive/mach64/libmach64.a \ libmach64.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \ $(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \ $(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \ $(top_builddir)/os/libos.a \

3
hw/kdrive/mga/Makefile.am
View File

@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir)/fb \ -I$(top_srcdir)/fb \
-I$(top_srcdir)/hw/kdrive/src \ -I$(top_srcdir)/hw/kdrive/src \
-I$(top_srcdir)/hw/kdrive/vesa \ -I$(top_srcdir)/hw/kdrive/vesa \
-I$(top_srcdir)/hw/kdrive/linux \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/mi \ -I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/layer \ -I$(top_srcdir)/miext/layer \
@ -23,7 +24,7 @@ Xmga_SOURCES = \
mgastub.c mgastub.c
Xmga_LDADD = \ Xmga_LDADD = \
$(top_builddir)/hw/kdrive/mga/libmga.a \ libmga.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \ $(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \ $(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \ $(top_builddir)/os/libos.a \

1
hw/kdrive/mga/mga.h
View File

@ -26,6 +26,7 @@
#ifndef _MGA_H_ #ifndef _MGA_H_
#define _MGA_H_ #define _MGA_H_
#include <vesa.h> #include <vesa.h>
#include <klinux.h>
#define MGA_REG_BASE(c) ((c)->attr.address[1]) #define MGA_REG_BASE(c) ((c)->attr.address[1])
#define MGA_REG_SIZE(c) (0x4000) #define MGA_REG_SIZE(c) (0x4000)

3
hw/kdrive/mga/mgadraw.c
View File

@ -213,9 +213,6 @@ KaaScreenInfoRec mgaKaa = {
Bool Bool
mgaDrawInit (ScreenPtr pScreen) mgaDrawInit (ScreenPtr pScreen)
{ {
KdScreenPriv(pScreen);
mgaScreenInfo (pScreenPriv);
if (!kaaDrawInit (pScreen, &mgaKaa)) if (!kaaDrawInit (pScreen, &mgaKaa))
return FALSE; return FALSE;

2
hw/kdrive/nvidia/Makefile.am
View File

@ -27,7 +27,7 @@ Xnvidia_SOURCES = \
nvidiastub.c nvidiastub.c
Xnvidia_LDADD = \ Xnvidia_LDADD = \
$(top_builddir)/hw/kdrive/nvidia/libnvidia.a \ libnvidia.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \ $(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \ $(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \ $(top_builddir)/os/libos.a \

2
hw/kdrive/r128/Makefile.am
View File

@ -23,7 +23,7 @@ Xr128_SOURCES = \
r128stub.c r128stub.c
Xr128_LDADD = \ Xr128_LDADD = \
$(top_builddir)/hw/kdrive/r128/libr128.a \ libr128.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \ $(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \ $(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \ $(top_builddir)/os/libos.a \

2
hw/kdrive/smi/Makefile.am
View File

@ -24,7 +24,7 @@ Xsmi_SOURCES = \
smistub.c smistub.c
Xsmi_LDADD = \ Xsmi_LDADD = \
$(top_builddir)/hw/kdrive/smi/libsmi.a \ libsmi.a \
$(top_builddir)/hw/kdrive/fbdev/libfbdev.a \ $(top_builddir)/hw/kdrive/fbdev/libfbdev.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \ $(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \ $(top_builddir)/dix/libdix.a \

2
hw/kdrive/vesa/Makefile.am
View File

@ -22,7 +22,7 @@ Xvesa_SOURCES = \
vesainit.c vesainit.c
Xvesa_LDADD = \ Xvesa_LDADD = \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \ libvesa.a \
$(top_builddir)/dix/libdix.a \ $(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \ $(top_builddir)/os/libos.a \
$(top_builddir)/miext/layer/liblayer.a \ $(top_builddir)/miext/layer/liblayer.a \