xserver/hw/xorg/input Imakefile, NONE, 1.1 Makefile.am, NONE, 1.1 confdrv.sh, NONE, 1.1

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver/hw/xorg/input
In directory pdx:/tmp/cvs-serv17025/hw/xorg/input

Added Files:
	Imakefile Makefile.am confdrv.sh 
Log Message:
Xizzle is dead, long live Xorg.

Re-import the DDX from X11R6.7, complete with automakey goodness, and do the
requisite configure.ac, et al, updates; also import the XKB extension from the
6.7 DIX.

Currently it'll link and then hang solid in RADEONInitAccel(), or the next
function if you enable NoAccel.


--- NEW FILE: Imakefile ---
XCOMM $XFree86: xc/programs/Xserver/hw/xfree86/input/Imakefile,v 1.15 2002/05/31 18:46:00 dawes Exp $

#define IHaveModules
#include <Server.tmpl>
#define IHaveSubdirs

#if JoystickSupport
JOYSTICKDIR = joystick
#endif

SUBDIRS = XInputDrivers $(JOYSTICKDIR)
DRIVERS = XInputDrivers

OBJS = `cat idriver.list`

#if DoLoadableServer
MakeSubdirs($(SUBDIRS))
#endif

#if MakeHasPosixVariableSubstitutions
DONES = $(DRIVERS:%=%/DONE)
#if HasGnuMake || HasBsdMake
$(DONES): $(SUBDIRS)
#endif
#if !DoLoadableServer
NormalDepLibraryTarget(idriver,$(SUBDIRS) $(DONES) idriver.list,$(OBJS))
#endif
#else
#if !DoLoadableServer
NormalDepLibraryTarget(idriver,$(SUBDIRS) idriver.list,$(OBJS))
#endif
#endif

INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(SERVERSRC)/include \
	   -I$(EXTINCSRC) -I$(XINCLUDESRC)

#if !DoLoadableServer
ConfigTargetNoDepend(drvConf,$(ICONFIGFILES),confdrv.SHsuf,$(DRIVERS))
DriverObjectList($(DRIVERS),idriver.list)
#endif

NormalLibraryObjectRule()

ForceSubdirs($(SUBDIRS))

DependSubdirs($(SUBDIRS))


--- NEW FILE: Makefile.am ---
lib_LIBRARIES = libinput.a

libinput_a_SOURCES = drvConf.c

drvConf.c:
	sh $(srcdir)/confdrv.sh
DISTCLEANFILES = drvConf.c

AM_CFLAGS = $(XORG_CFLAGS)

INCLUDES = $(XORG_INCS) -I$(top_srcdir)/mi \
           -I$(srcdir)/../loader -I$(srcdir)/../ddc \
           -I$(srcdir)/../rac -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
           -I$(srcdir)/../i2c -I$(srcdir)/../parser -I$(srcdir)/../vgahw \
           -I$(srcdir)/../Xi -I$(top_srcdir)/os

--- NEW FILE: confdrv.sh ---
#!/bin/sh

# $XFree86: xc/programs/Xserver/hw/xfree86/input/confdrv.sh,v 1.4 1999/05/17 13:17:16 dawes Exp $
#
# This script generates drvConf.c
#
# usage: confdrv.sh driver1 driver2 ...
#

DRVCONF=./drvConf.c
BUILTIN="xf86KEYBOARD"

cat > $DRVCONF <<EOF
/*
 * This file is generated automatically -- DO NOT EDIT
 */

#include "xf86.h"
#include "xf86Xinput.h"

extern InputDriverRec
EOF
Args="$BUILTIN `echo $* | tr '[a-z]' '[A-Z]'`"
set - $Args
while [ $# -gt 1 ]; do
  echo "#undef $1" >> $DRVCONF
  echo "	$1," >> $DRVCONF
  shift
done
echo "#undef $1" >> $DRVCONF
echo "	$1;" >> $DRVCONF
cat >> $DRVCONF <<EOF

InputDriverPtr xf86InputDriverList[] =
{
EOF
for i in $Args; do
  echo "	&$i," >> $DRVCONF
done
cat >> $DRVCONF <<EOF
};

int xf86NumInputDrivers = sizeof(xf86InputDriverList) / sizeof(xf86InputDriverList[0]);

EOF