Commit f5916edb authored by Keith Packard's avatar Keith Packard

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
parent b3e47ce1
......@@ -19,7 +19,7 @@ Xfbdev_SOURCES = \
fbinit.c
Xfbdev_LDADD = \
$(top_builddir)/hw/kdrive/fbdev/libfbdev.a \
libfbdev.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
$(top_builddir)/miext/layer/liblayer.a \
......
......@@ -27,7 +27,7 @@ Xmach64_SOURCES = \
mach64stub.c
Xmach64_LDADD = \
$(top_builddir)/hw/kdrive/mach64/libmach64.a \
libmach64.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
......
......@@ -2,6 +2,7 @@ INCLUDES = \
-I$(top_srcdir)/fb \
-I$(top_srcdir)/hw/kdrive/src \
-I$(top_srcdir)/hw/kdrive/vesa \
-I$(top_srcdir)/hw/kdrive/linux \
-I$(top_srcdir)/include \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/layer \
......@@ -23,7 +24,7 @@ Xmga_SOURCES = \
mgastub.c
Xmga_LDADD = \
$(top_builddir)/hw/kdrive/mga/libmga.a \
libmga.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
......
......@@ -26,6 +26,7 @@
#ifndef _MGA_H_
#define _MGA_H_
#include <vesa.h>
#include <klinux.h>
#define MGA_REG_BASE(c) ((c)->attr.address[1])
#define MGA_REG_SIZE(c) (0x4000)
......
......@@ -213,9 +213,6 @@ KaaScreenInfoRec mgaKaa = {
Bool
mgaDrawInit (ScreenPtr pScreen)
{
KdScreenPriv(pScreen);
mgaScreenInfo (pScreenPriv);
if (!kaaDrawInit (pScreen, &mgaKaa))
return FALSE;
......
......@@ -27,7 +27,7 @@ Xnvidia_SOURCES = \
nvidiastub.c
Xnvidia_LDADD = \
$(top_builddir)/hw/kdrive/nvidia/libnvidia.a \
libnvidia.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
......
......@@ -23,7 +23,7 @@ Xr128_SOURCES = \
r128stub.c
Xr128_LDADD = \
$(top_builddir)/hw/kdrive/r128/libr128.a \
libr128.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
......
......@@ -24,7 +24,7 @@ Xsmi_SOURCES = \
smistub.c
Xsmi_LDADD = \
$(top_builddir)/hw/kdrive/smi/libsmi.a \
libsmi.a \
$(top_builddir)/hw/kdrive/fbdev/libfbdev.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \
......
......@@ -22,7 +22,7 @@ Xvesa_SOURCES = \
vesainit.c
Xvesa_LDADD = \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \
libvesa.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
$(top_builddir)/miext/layer/liblayer.a \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment