diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am new file mode 100644 index 000000000..a443de2b7 --- /dev/null +++ b/hw/kdrive/Makefile.am @@ -0,0 +1,47 @@ +SUBDIRS = \ + vesa + +INCLUDES = \ + -I$(top_srcdir)/fb \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/mi \ + -I$(top_srcdir)/miext/shadow \ + -I$(top_srcdir)/randr \ + -I$(top_srcdir)/render + + +noinst_LTLIBRARIES = libkdrive.la + +libkdrive_la_SOURCES = \ + kaa.c \ + kasync.c \ + kcmap.c \ + kcolor.c \ + kcurscol.c \ + kdrive.c \ + kinfo.c \ + kinput.c \ + kmap.c \ + kmode.c \ + knoop.c \ + kpict.c \ + kshadow.c \ + ktest.c \ + kxv.c \ + vga.c + +libkdrive_la_LIBADD = \ + $(top_builddir)/dix/libdix.la \ + $(top_builddir)/fb/libfb.la \ + $(top_builddir)/mi/libmi.la \ + $(top_builddir)/render/librender.la \ + $(top_builddir)/randr/librandr.la \ + $(top_builddir)/os/libos.la \ + $(X_LIBS) -lXfont + + +bin_PROGRAMS = Xvesa + +Xvesa_SOURCES = # Intentionally left blank + +Xvesa_LDADD = $(top_builddir)/hw/kdrive/libkdrive.la diff --git a/hw/kdrive/itsy/ts.c b/hw/kdrive/itsy/ts.c index c3548ba10..8501a5f86 100644 --- a/hw/kdrive/itsy/ts.c +++ b/hw/kdrive/itsy/ts.c @@ -25,7 +25,7 @@ #define NEED_EVENTS #include "itsy.h" -#include "Xproto.h" +#include #include "inputstr.h" #include "Xpoll.h" diff --git a/hw/kdrive/linux/agp.c b/hw/kdrive/linux/agp.c index b84743a78..61d0dfb64 100644 --- a/hw/kdrive/linux/agp.c +++ b/hw/kdrive/linux/agp.c @@ -41,7 +41,7 @@ of the copyright holder. * Author: Pontus Lidman (adaption to KDrive) and others */ -#include "X.h" +#include #include "Xdefs.h" #include "Xmd.h" diff --git a/hw/kdrive/linux/bus.c b/hw/kdrive/linux/bus.c index 20161c8c5..d9893d552 100644 --- a/hw/kdrive/linux/bus.c +++ b/hw/kdrive/linux/bus.c @@ -23,8 +23,8 @@ */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "kdrive.h" diff --git a/hw/kdrive/linux/mouse.c b/hw/kdrive/linux/mouse.c index 61a255646..59e5dbd3d 100644 --- a/hw/kdrive/linux/mouse.c +++ b/hw/kdrive/linux/mouse.c @@ -23,8 +23,8 @@ */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "kdrive.h" diff --git a/hw/kdrive/linux/ms.c b/hw/kdrive/linux/ms.c index 80f131124..0906ff003 100644 --- a/hw/kdrive/linux/ms.c +++ b/hw/kdrive/linux/ms.c @@ -23,8 +23,8 @@ THE SOFTWARE. /* $RCSId: xc/programs/Xserver/hw/kdrive/linux/ms.c,v 1.1 2001/08/09 20:45:15 dawes Exp $ */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "kdrive.h" diff --git a/hw/kdrive/linux/ps2.c b/hw/kdrive/linux/ps2.c index 856d41a06..58710718e 100644 --- a/hw/kdrive/linux/ps2.c +++ b/hw/kdrive/linux/ps2.c @@ -23,8 +23,8 @@ */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "kdrive.h" diff --git a/hw/kdrive/linux/ts.c b/hw/kdrive/linux/ts.c index 1fa12eddd..75e79338e 100644 --- a/hw/kdrive/linux/ts.c +++ b/hw/kdrive/linux/ts.c @@ -26,8 +26,8 @@ */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "kdrive.h" diff --git a/hw/kdrive/linux/tslib.c b/hw/kdrive/linux/tslib.c index 3f491b285..13fc40209 100644 --- a/hw/kdrive/linux/tslib.c +++ b/hw/kdrive/linux/tslib.c @@ -47,8 +47,8 @@ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "kdrive.h" diff --git a/hw/kdrive/pcmcia/pcmciarotate.c b/hw/kdrive/pcmcia/pcmciarotate.c index a91c31e50..7f6315437 100644 --- a/hw/kdrive/pcmcia/pcmciarotate.c +++ b/hw/kdrive/pcmcia/pcmciarotate.c @@ -22,7 +22,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" #include "font.h" diff --git a/hw/kdrive/pcmcia/pcmciashadow.c b/hw/kdrive/pcmcia/pcmciashadow.c index c84b7a6c0..0047ddca7 100644 --- a/hw/kdrive/pcmcia/pcmciashadow.c +++ b/hw/kdrive/pcmcia/pcmciashadow.c @@ -23,7 +23,7 @@ */ /* $RCSId: xc/programs/Xserver/hw/kdrive/pcmcia/pcmciashadow.c,v 1.1 2001/05/23 08:56:09 alanh Exp $ */ -#include "X.h" +#include #include "scrnintstr.h" #include "windowstr.h" #include "font.h" diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h index 4a54140ab..ec6cc3f5b 100644 --- a/hw/kdrive/src/kdrive.h +++ b/hw/kdrive/src/kdrive.h @@ -24,10 +24,10 @@ /* $RCSId: xc/programs/Xserver/hw/kdrive/kdrive.h,v 1.29 2002/11/13 16:37:39 keithp Exp $ */ #include -#include "X.h" +#include #define NEED_EVENTS -#include "Xproto.h" -#include "Xos.h" +#include +#include #include "scrnintstr.h" #include "pixmapstr.h" #include "windowstr.h" diff --git a/hw/kdrive/src/kxv.c b/hw/kdrive/src/kxv.c index dadce9466..2f57a6f0d 100644 --- a/hw/kdrive/src/kxv.c +++ b/hw/kdrive/src/kxv.c @@ -49,8 +49,8 @@ of the copyright holder. #include "gcstruct.h" #include "dixstruct.h" -#include "Xv.h" -#include "Xvproto.h" +#include +#include #include "kxv.h" diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am new file mode 100644 index 000000000..b94ef9c4d --- /dev/null +++ b/hw/kdrive/vesa/Makefile.am @@ -0,0 +1,19 @@ +INCLUDES = \ + -I$(top_srcdir)/fb \ + -I$(top_srcdir)/hw/kdrive \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/mi \ + -I$(top_srcdir)/miext/layer \ + -I$(top_srcdir)/miext/shadow \ + -I$(top_srcdir)/randr \ + -I$(top_srcdir)/render + + +noinst_LTLIBRARIES = libvesa.la + +libvesa_la_SOURCES = \ + vesa.c \ + vesainit.c \ + vbe.c \ + vga.c \ + vm86.c diff --git a/hw/kdrive/vesa/vm86.h b/hw/kdrive/vesa/vm86.h index b5c371e2b..e37cd7f28 100644 --- a/hw/kdrive/vesa/vm86.h +++ b/hw/kdrive/vesa/vm86.h @@ -63,9 +63,9 @@ static void ErrorF(char*, ...); #define xcalloc(a,b) calloc(a,b) #define xfree(a) free(a) #else -#include "X.h" -#include "Xproto.h" -#include "Xos.h" +#include +#include +#include #include "os.h" #endif diff --git a/hw/kdrive/vxworks/vxmouse.c b/hw/kdrive/vxworks/vxmouse.c index 217ddd12e..ad6e2c03d 100644 --- a/hw/kdrive/vxworks/vxmouse.c +++ b/hw/kdrive/vxworks/vxmouse.c @@ -7,8 +7,8 @@ */ #define NEED_EVENTS -#include "X.h" -#include "Xproto.h" +#include +#include #include "inputstr.h" #include "scrnintstr.h" #include "kdrive.h"