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

9 files changed, 9 insertions, 10 deletions

diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am
index a9dda001c..43e737cc4 100644
--- a/hw/kdrive/fbdev/Makefile.am
+++ b/hw/kdrive/fbdev/Makefile.am
@@ -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		\
diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am
index e53811563..2a960ec5f 100644
--- a/hw/kdrive/mach64/Makefile.am
+++ b/hw/kdrive/mach64/Makefile.am
@@ -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		\
diff --git a/hw/kdrive/mga/Makefile.am b/hw/kdrive/mga/Makefile.am
index d7a908e5a..bcc7607ab 100644
--- a/hw/kdrive/mga/Makefile.am
+++ b/hw/kdrive/mga/Makefile.am
@@ -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		\
diff --git a/hw/kdrive/mga/mga.h b/hw/kdrive/mga/mga.h
index 408db3acb..8a4eb9f08 100644
--- a/hw/kdrive/mga/mga.h
+++ b/hw/kdrive/mga/mga.h
@@ -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)
diff --git a/hw/kdrive/mga/mgadraw.c b/hw/kdrive/mga/mgadraw.c
index 1f77ccf2f..29678db6c 100644
--- a/hw/kdrive/mga/mgadraw.c
+++ b/hw/kdrive/mga/mgadraw.c
@@ -213,9 +213,6 @@ KaaScreenInfoRec mgaKaa = {
 Bool
 mgaDrawInit (ScreenPtr pScreen)
 {
-    KdScreenPriv(pScreen);
-    mgaScreenInfo (pScreenPriv);
-    
     if (!kaaDrawInit (pScreen, &mgaKaa))
 	return FALSE;
 
diff --git a/hw/kdrive/nvidia/Makefile.am b/hw/kdrive/nvidia/Makefile.am
index 4ecdab0de..324595e8c 100644
--- a/hw/kdrive/nvidia/Makefile.am
+++ b/hw/kdrive/nvidia/Makefile.am
@@ -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		\
diff --git a/hw/kdrive/r128/Makefile.am b/hw/kdrive/r128/Makefile.am
index 9a816a496..86d3070d3 100644
--- a/hw/kdrive/r128/Makefile.am
+++ b/hw/kdrive/r128/Makefile.am
@@ -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		\
diff --git a/hw/kdrive/smi/Makefile.am b/hw/kdrive/smi/Makefile.am
index b88503282..d512ecc6b 100644
--- a/hw/kdrive/smi/Makefile.am
+++ b/hw/kdrive/smi/Makefile.am
@@ -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		\
diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am
index 8bfb8a919..1c639a2e2 100644
--- a/hw/kdrive/vesa/Makefile.am
+++ b/hw/kdrive/vesa/Makefile.am
@@ -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	\