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

Daniel Stone xserver-commit at pdx.freedesktop.org
Sun Apr 25 23:52:16 EST 2004


Committed by: daniel

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

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/drivers/Imakefile,v 1.22 2001/07/02 10:46:04 alanh Exp $

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

SUBDIRS = XF86CardDrivers
DRIVERS = XF86CardDrivers

OBJS = `cat driver.list`

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

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

INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC) -I$(SERVERSRC)/include \
		-I$(XINCLUDESRC)
#if !DoLoadableServer
ConfigTargetNoDepend(drvConf,$(ICONFIGFILES),confdrv.SHsuf,$(DRIVERS))
DriverObjectList($(DRIVERS),driver.list)
#endif

NormalLibraryObjectRule()

ForceSubdirs($(SUBDIRS))

DependSubdirs($(SUBDIRS))

InstallDriverSDKNonExecFile(Imakefile,$(DRIVERSDKDIR)/drivers)


--- NEW FILE: Makefile.am ---
SUBDIRS = ati

lib_LIBRARIES = libdrivers.a

libdrivers_a_SOURCES = drvConf.c

drvConf.c:
	sh $(srcdir)/confdrv.sh $(SUBDIRS)
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/drivers/confdrv.sh,v 1.1.2.1 1998/06/03 15:50:02 dawes Exp $
#
# This script generates drvConf.c
#
# usage: confdrv.sh driver1 driver2 ...
#

DRVCONF=./drvConf.c

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

#include "xf86.h"

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

DriverPtr xf86DriverList[] =
{
EOF
for i in $Args; do
  echo "	&$i," >> $DRVCONF
done
echo "};" >> $DRVCONF

cat >> $DRVCONF <<EOF

int xf86NumDrivers = sizeof(xf86DriverList) / sizeof(xf86DriverList[0]);

EOF




More information about the xserver-commit mailing list