Commit ef8977a3 authored by Keith Packard's avatar Keith Packard

More build fixes

parent 14a8311b
......@@ -30,19 +30,3 @@ libkdrive_la_SOURCES = \
ktest.c \
kxv.c \
vga.c
bin_PROGRAMS = Xvesa
Xvesa_SOURCES = # Intentionally left blank
Xvesa_LDADD = \
$(top_builddir)/dix/libdix.la \
$(top_builddir)/hw/kdrive/libkdrive.la \
$(top_builddir)/hw/kdrive/linux/liblinux.la \
$(top_builddir)/hw/kdrive/vesa/libvesa.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 -lm -lz
......@@ -43,9 +43,6 @@ of the copyright holder.
#include <X11/X.h>
#include "Xdefs.h"
#include "Xmd.h"
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
......@@ -62,7 +59,7 @@ of the copyright holder.
#if defined(linux)
#include <asm/ioctl.h>
#include "../../xfree86/os-support/linux/agpgart.h"
#include <linux/agpgart.h>
#elif defined(__FreeBSD__)
#include <sys/ioctl.h>
......
......@@ -40,7 +40,8 @@ X Window System is a trademark of The Open Group */
#ifndef _AGP_H_
#define _AGP_H_
#include "Xdefs.h"
#include <X11/Xdefs.h>
#include <X11/Xmd.h>
/* These two definitions must be consistent with the kernel's,
but using 1 or 2 in driver code is even uglier */
......@@ -48,8 +49,8 @@ X Window System is a trademark of The Open Group */
#define AGP_PHYS_MEMORY 2
typedef struct _AgpInfo {
CARD32 bridgeId;
CARD32 agpMode;
unsigned long bridgeId;
unsigned long agpMode;
unsigned long base;
unsigned long size;
unsigned long totalPages;
......
......@@ -25,10 +25,10 @@
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xpoll.h>
#include "inputstr.h"
#include "scrnintstr.h"
#include "kdrive.h"
#include "Xpoll.h"
/* /dev/adbmouse is a busmouse */
......
......@@ -29,7 +29,7 @@
#include <linux/kd.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <keysym.h>
#include <X11/keysym.h>
#include <linux/apm_bios.h>
static int vtno;
......
......@@ -23,14 +23,14 @@
*/
#define NEED_EVENTS
#include <errno.h>
#include <termios.h>
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xpoll.h>
#include "inputstr.h"
#include "scrnintstr.h"
#include "kdrive.h"
#include "Xpoll.h"
#include <errno.h>
#include <termios.h>
#undef DEBUG
#undef DEBUG_BYTES
......
......@@ -23,14 +23,14 @@ 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 <errno.h>
#include <termios.h>
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xpoll.h>
#include "inputstr.h"
#include "scrnintstr.h"
#include "kdrive.h"
#include "Xpoll.h"
#include <errno.h>
#include <termios.h>
int
MsReadBytes (int fd, char *buf, int len, int min)
......
......@@ -25,10 +25,10 @@
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xpoll.h>
#include "inputstr.h"
#include "scrnintstr.h"
#include "kdrive.h"
#include "Xpoll.h"
int
Ps2ReadBytes (int fd, char *buf, int len, int min)
......
......@@ -28,10 +28,10 @@
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xpoll.h>
#include "inputstr.h"
#include "scrnintstr.h"
#include "kdrive.h"
#include "Xpoll.h"
#include <sys/ioctl.h>
#if 1
#include <linux/h3600_ts.h> /* touch screen events */
......
......@@ -49,10 +49,10 @@
#define NEED_EVENTS
#include <X11/X.h>
#include <X11/Xproto.h>
#include <X11/Xpoll.h>
#include "inputstr.h"
#include "scrnintstr.h"
#include "kdrive.h"
#include "Xpoll.h"
#include <sys/ioctl.h>
#include <tslib.h>
......
......@@ -9,11 +9,27 @@ INCLUDES = \
-I$(top_srcdir)/render
noinst_LTLIBRARIES = libvesa.la
bin_PROGRAMS = Xvesa
libvesa_la_SOURCES = \
Xvesa_SOURCES = \
vesa.c \
vesainit.c \
vbe.c \
vga.c \
vm86.c
Xvesa_LDADD = \
$(top_builddir)/dix/libdix.la \
$(top_builddir)/hw/kdrive/libkdrive.la \
$(top_builddir)/hw/kdrive/linux/liblinux.la \
$(top_builddir)/fb/libfb.la \
$(top_builddir)/mi/libmi.la \
$(top_builddir)/Xext
$(top_builddir)/miext/layer/liblayer.la \
$(top_builddir)/miext/shadow/libshadow.la \
$(top_builddir)/render/librender.la \
$(top_builddir)/randr/librandr.la \
$(top_builddir)/os/libos.la \
$(top_builddir)/xtrans/libxtrans.la \
$(X_LIBS) -lXfont -lXau -lXdmcp \
-lm -lz
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