debrix-input-mouse ChangeLog, NONE, 1.1 Makefile.am, NONE, 1.1 autogen.sh, NONE, 1.1 configure.ac, NONE, 1.1 mouse.c, 1.2, 1.3 mouse.h, 1.1.1.2, 1.2 mousePriv.h, 1.1.1.2, 1.2 pnp.c, 1.2, 1.3

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/debrix-input-mouse
In directory pdx:/home/daniel/x/debrix/debrix-input-mouse-200406110418

Modified Files:
	mouse.c mouse.h mousePriv.h pnp.c 
Added Files:
	ChangeLog Makefile.am autogen.sh configure.ac 
Log Message:
Initial import of sources from monolithic tree.

--- NEW FILE: ChangeLog ---
2004-06-11  Daniel Stone  <daniel at freedesktop.org>

	* Initial import of sources from monolithic tree.

--- NEW FILE: Makefile.am ---
AUTOMAKE_OPTIONS = foreign
driver_LTLIBRARIES = libmouse.la
libmouse_la_SOURCES = mouse.c pnp.c
man_MANS = mouse.3

--- NEW FILE: autogen.sh ---
#! /bin/sh
autoreconf -v --install || exit 1
./configure --enable-maintainer-mode "$@"

--- NEW FILE: configure.ac ---
#                                               -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.

AC_PREREQ(2.57)
AC_INIT([debrix-input-mouse],
        0.1.0,
        [daniel at freedesktop.org],
        debrix-input-mouse)

AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2])

AM_CONFIG_HEADER([config.h])
AC_CONFIG_AUX_DIR(.)

# Checks for programs.
AC_PROG_LIBTOOL
AC_PROG_CC

# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, debrix)
driverdir=$(pkg-config --variable=driverdir debrix)
AC_SUBST([driverdir])

CFLAGS="$XORG_CFLAGS -include debrix.h -DPNP_MOUSE "
INCLUDES="$XORG_INCS"
AC_SUBST([CFLAGS])
AC_SUBST([INCLUDES])

# Checks for libraries.

# Checks for header files.
AC_HEADER_STDC

AC_OUTPUT([Makefile])

Index: mouse.c
===================================================================
RCS file: /cvs/xserver/debrix-input-mouse/mouse.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mouse.c	23 Apr 2004 19:54:04 -0000	1.2
+++ mouse.c	10 Jun 2004 18:55:12 -0000	1.3
@@ -45,15 +45,18 @@
  * and to help limited dexterity persons
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 
 #include "xf86.h"
 
 #ifdef XINPUT
-#include "XI.h"
-#include "XIproto.h"
+#include <X11/extensions/XI.h>
+#include <X11/extensions/XIproto.h>
 #include "extnsionst.h"
 #include "extinit.h"
 #else
@@ -63,7 +66,9 @@
 #include "xf86Xinput.h"
 #include "xf86_OSproc.h"
 #include "xf86OSmouse.h"
+#ifndef NEED_XF86_TYPES
 #define NEED_XF86_TYPES	/* for xisb.h when !XFree86LOADER */
+#endif
 #include "xf86_ansic.h"
 #include "compiler.h"
 

Index: mouse.h
===================================================================
RCS file: /cvs/xserver/debrix-input-mouse/mouse.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- mouse.h	25 Nov 2003 19:28:48 -0000	1.1.1.2
+++ mouse.h	10 Jun 2004 18:55:12 -0000	1.2
@@ -4,6 +4,9 @@
  * Copyright (c) 1997-1999 by The XFree86 Project, Inc.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef MOUSE_H_
 #define MOUSE_H_
 

Index: mousePriv.h
===================================================================
RCS file: /cvs/xserver/debrix-input-mouse/mousePriv.h,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -u -d -r1.1.1.2 -r1.2
--- mousePriv.h	25 Nov 2003 19:28:48 -0000	1.1.1.2
+++ mousePriv.h	10 Jun 2004 18:55:12 -0000	1.2
@@ -3,6 +3,9 @@
  * Copyright (c) 1997-1999 by The XFree86 Project, Inc.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifndef _X_MOUSEPRIV_H
 #define _X_MOUSEPRIV_H
 

Index: pnp.c
===================================================================
RCS file: /cvs/xserver/debrix-input-mouse/pnp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pnp.c	23 Apr 2004 19:54:04 -0000	1.2
+++ pnp.c	10 Jun 2004 18:55:12 -0000	1.3
@@ -21,9 +21,12 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xproto.h>
 #include "inputstr.h"
 #include "scrnintstr.h"
 #include "xf86.h"