merge xfixes_2_branch back to HEAD

This commit is contained in:
Keith Packard 2003-11-02 19:56:10 +00:00
commit 5378236aa6
51 changed files with 920 additions and 996 deletions

View file

@ -1,12 +1,6 @@
INCLUDES = \
-I$(top_srcdir)/fb \
-I$(top_srcdir)/hw/kdrive/src \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/layer \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render \
$(XSERVER_CFLAGS)
@KDRIVE_INCS@ \
@XSERVER_CFLAGS@
noinst_LIBRARIES = libvesa.a
@ -23,20 +17,9 @@ Xvesa_SOURCES = \
Xvesa_LDADD = \
libvesa.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
$(top_builddir)/miext/layer/liblayer.a \
$(top_builddir)/hw/kdrive/src/libkdrive.a \
$(top_builddir)/hw/kdrive/linux/liblinux.a \
$(top_builddir)/miext/shadow/libshadow.a \
$(top_builddir)/randr/librandr.a \
$(top_builddir)/render/librender.a \
$(top_builddir)/xfixes/libxfixes.a \
$(top_builddir)/fb/libfb.a \
$(top_builddir)/mi/libmi.a \
$(top_builddir)/Xext/libXext.a \
$(top_builddir)/randr/librandr.a \
$(top_builddir)/render/librender.a \
$(top_builddir)/xfixes/libxfixes.a \
$(top_builddir)/dix/libxpstubs.a \
$(XSERVER_LIBS)
@KDRIVE_LIBS@ \
@XSERVER_LIBS@
Xvesa_DEPENDENCIES = \
libvesa.a \
@KDRIVE_LIBS@