[xserver-commit] xfree86/common Makefile.am,NONE,3.1 miinitext.c,NONE,3.1

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xfree86/common
In directory pdx:/home/daniel/src/xserver/hw/xfree86/common

Added Files:
	Makefile.am miinitext.c 
Log Message:
Checkin #3: Makefile.am's, files that've been moved and/or added.

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

#if SPARC
#SBUSSOURCES = xf86sbusBus.c
#endif

#if DEBUG
#DEBUGSOURCES = xf86Debug.c
#endif

#if BUILDXV
XVSOURCES = xf86xv.c xf86xvmc.c
#endif

#if BUILDXKB
XKBSOURCES = xf86XKB.c
#endif

#if BUILDXI
XISOURCES = xf86Xinput.c xisb.c
#endif

#if BUILDRANDR
RANDRSOURCES = xf86RandR.c
#endif

BUSSOURCES = xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUSSOURCES)

#if LINUX
KBDSOURCES = xf86KbdLnx.c
# XXX psuedocodeish
#else if BSD
#KBDSOURCES = xf86KbdBSD.c
#else if Mach && !GNU/Mach
#KBDSOURCES = xf86KbdMach.c
#else
#KBDSOURCES = xf86Kbd.c
#endif


# shouldn't isaBus and pciBus only be built on the relevant architectures? -ds
# ditto DoScanPci
libxf86common_a_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
                          xf86Cursor.c xf86DGA.c xf86DPMS.c xf86DefModes.c \
                          xf86DoProbe.c xf86DoScanPci.c xf86Events.c \
                          xf86Globals.c xf86Helper.c xf86Init.c xf86Io.c \
                          xf86MiscExt.c xf86Mode.c xf86Option.c xf86VidMode.c \
                          xf86fbman.c xf86cmap.c xf86PM.c xf86Versions.c \
                          $(XVSOURCES) $(BUSSOURCES) $(XKBSOURCES) \
                          $(DEBUGSOURCES) $(XISOURCES) $(RANDRSOURCES) \
                          $(KBDSOURCES) miinitext.c

AM_CFLAGS = $(XF86_CFLAGS)

INCLUDES = $(XF86_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

sdk_INCLUDEDIR = $(includedir)/X11/XF86SDK
sdk_INCLUDES = compiler.h fourcc.h xf86.h xf86Module.h xf8Opt.h xf86Pci.h \
               xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
               xf86Version.h xf86Version.h xf86Xinput.h xf86cmap.h xf86fbman.h \
               xf86str.h xf86xv.h xf86xvmc.h xisb.h

--- NEW FILE: miinitext.c ---
/* This is the worst hack I've yet perpetuated. I'd like to apologise.
 * Daniel Stone <daniel@freedesktop.org>, Feb 16th, 2004. */

#define NO_XFIXES
#define NO_DAMAGEEXT
#define NO_COMPOSITE
/* FIXME THIS FILE SHOULDN'T EXIST, BUT THIS IS SRCDIR != BUILDDIR UNSAFE. */
#include "../../../mi/miinitext.c"