fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-05-08 12:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Ok, so this change is way bigger than it needed to be, but I couldn't stand

Browse source 
it anymore. The "real" change here is the addition of the damage
    extension server side pieces and a minor change of the miext/damage
    interface to add a callback on damage destroy. All of the configuration
    changes are to add macros for various sets of libraries so that we
    don't have to keep editing every Makefile.am whenever we add another
    extension to the library. The xfixes changes expose VERIFY_REGION so
    that damageext can use it.
This commit is contained in:
Keith Packard 2003-10-24 06:35:24 +00:00
parent d67e480c32
commit d5b176b2d4
9 changed files with 35 additions and 195 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
hw/kdrive/fbdev/Makefile.am
View file

@ -1,11 +1,5 @@
INCLUDES = \
-I$(top_srcdir)/fb \
-I$(top_srcdir)/hw/kdrive/src \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/damage \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render \
@KDRIVE_INCS@ \
$(XSERVER_CFLAGS)
noinst_LIBRARIES = libfbdev.a
@ -18,26 +12,14 @@ libfbdev_a_SOURCES = \
Xfbdev_SOURCES = \
fbinit.c
Xfbdev_LDADD = \
Xfbdev_LDADD = \
libfbdev.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
$(top_builddir)/hw/kdrive/src/libkdrive.a \
$(top_builddir)/hw/kdrive/linux/liblinux.a \
$(top_builddir)/miext/shadow/libshadow.a \
$(top_builddir)/miext/damage/libdamage.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) \
-lm -lz
$(KDRIVE_LIBS) \
$(XSERVER_LIBS)
Xfbdev_DEPENDENCIES = \
libfbdev.a \
$(KDRIVE_LIBS)
if TSLIB
Xfbdev_LDADD += -lts

8
hw/kdrive/linux/Makefile.am
View file

@ -1,11 +1,5 @@
INCLUDES = \
-I$(top_srcdir)/hw/kdrive/src \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/fb \
-I$(top_srcdir)/miext/damage \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render \
@KDRIVE_INCS@ \
$(XSERVER_CFLAGS)

41
hw/kdrive/mach64/Makefile.am
View file

@ -1,13 +1,6 @@
INCLUDES = \
-I$(top_srcdir)/fb \
-I$(top_srcdir)/hw/kdrive/src \
-I$(top_srcdir)/hw/kdrive/linux \
@KDRIVE_INCS@ \
-I$(top_srcdir)/hw/kdrive/vesa \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/damage \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render \
$(XSERVER_CFLAGS)
bin_PROGRAMS = Xmach64
@ -22,28 +15,16 @@ libmach64_a_SOURCES = \
mach64.h \
mach64draw.h
Xmach64_SOURCES = \
mach64stub.c
Xmach64_LDADD = \
libmach64.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
$(top_builddir)/hw/kdrive/src/libkdrive.a \
$(top_builddir)/hw/kdrive/linux/liblinux.a \
$(top_builddir)/miext/shadow/libshadow.a \
$(top_builddir)/miext/damage/libdamage.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) \
-lm -lz
MACH64_LIBS = \
libmach64.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a
Xmach64_LDADD = \
$(MACH64_LIBS) \
$(KDRIVE_LIBS) \
$(XSERVER_LIBS)
Xmach64_DEPENDENCIES = $(MACH64_LIBS) $(KDRIVE_LIBS)

29
hw/kdrive/mga/Makefile.am
View file

@ -1,14 +1,6 @@
INCLUDES = \
-I$(top_srcdir)/fb \
-I$(top_srcdir)/hw/kdrive/src \
@KDRIVE_INCS@ \
-I$(top_srcdir)/hw/kdrive/vesa \
-I$(top_srcdir)/hw/kdrive/linux \
-I$(top_srcdir)/include \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/miext/damage \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render \
$(XSERVER_CFLAGS)
bin_PROGRAMS = Xmga
@ -26,21 +18,4 @@ Xmga_SOURCES = \
Xmga_LDADD = \
libmga.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
$(top_builddir)/hw/kdrive/src/libkdrive.a \
$(top_builddir)/hw/kdrive/linux/liblinux.a \
$(top_builddir)/miext/shadow/libshadow.a \
$(top_builddir)/miext/damage/libdamage.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) \
-lm -lz
@KDRIVE_LIBS@

27
hw/kdrive/nvidia/Makefile.am
View file

@ -1,12 +1,6 @@
INCLUDES = \
-I$(top_srcdir)/fb \
-I$(top_srcdir)/hw/kdrive/src \
@KDRIVE_INCS@ \
-I$(top_srcdir)/hw/kdrive/vesa \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/miext/damage \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render \
$(XSERVER_CFLAGS)
bin_PROGRAMS = Xnvidia
@ -29,21 +23,4 @@ Xnvidia_SOURCES = \
Xnvidia_LDADD = \
libnvidia.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
$(top_builddir)/hw/kdrive/src/libkdrive.a \
$(top_builddir)/hw/kdrive/linux/liblinux.a \
$(top_builddir)/miext/shadow/libshadow.a \
$(top_builddir)/miext/damage/libdamage.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) \
-lm -lz
@KDRIVE_LIBS@

28
hw/kdrive/r128/Makefile.am
View file

@ -1,13 +1,6 @@
INCLUDES = \
-I$(top_srcdir)/fb \
-I$(top_srcdir)/hw/kdrive/src \
@KDRIVE_INCS@ \
-I$(top_srcdir)/hw/kdrive/vesa \
-I$(top_srcdir)/include \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/miext/damage \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render \
$(XSERVER_CFLAGS)
bin_PROGRAMS = Xr128
@ -25,21 +18,4 @@ Xr128_SOURCES = \
Xr128_LDADD = \
libr128.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
$(top_builddir)/hw/kdrive/src/libkdrive.a \
$(top_builddir)/hw/kdrive/linux/liblinux.a \
$(top_builddir)/miext/shadow/libshadow.a \
$(top_builddir)/miext/damage/libdamage.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) \
-lm -lz
@KDRIVE_LIBS@

27
hw/kdrive/smi/Makefile.am
View file

@ -1,13 +1,7 @@
INCLUDES = \
-I$(top_srcdir)/fb \
-I$(top_srcdir)/hw/kdrive/src \
@KDRIVE_INCS@ \
-I$(top_srcdir)/hw/kdrive/fbdev \
-I$(top_srcdir)/hw/kdrive/vesa \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/miext/damage \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render \
$(XSERVER_CFLAGS)
bin_PROGRAMS = Xsmi
@ -27,21 +21,4 @@ Xsmi_LDADD = \
libsmi.a \
$(top_builddir)/hw/kdrive/fbdev/libfbdev.a \
$(top_builddir)/hw/kdrive/vesa/libvesa.a \
$(top_builddir)/dix/libdix.a \
$(top_builddir)/os/libos.a \
$(top_builddir)/hw/kdrive/src/libkdrive.a \
$(top_builddir)/hw/kdrive/linux/liblinux.a \
$(top_builddir)/miext/shadow/libshadow.a \
$(top_builddir)/miext/damage/libdamage.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) \
-lm -lz
@KDRIVE_LIBS@

7
hw/kdrive/src/Makefile.am
View file

@ -1,10 +1,5 @@
INCLUDES = \
-I$(top_srcdir)/fb \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/miext/damage \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render \
@KDRIVE_INCS@ \
$(XSERVER_CFLAGS)
noinst_LIBRARIES = libkdrive.a

29
hw/kdrive/vesa/Makefile.am
View file

@ -1,11 +1,5 @@
INCLUDES = \
-I$(top_srcdir)/fb \
-I$(top_srcdir)/hw/kdrive/src \
-I$(top_srcdir)/mi \
-I$(top_srcdir)/miext/damage \
-I$(top_srcdir)/miext/shadow \
-I$(top_srcdir)/randr \
-I$(top_srcdir)/render \
@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)/hw/kdrive/src/libkdrive.a \
$(top_builddir)/hw/kdrive/linux/liblinux.a \
$(top_builddir)/miext/damage/libdamage.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 \
$(KDRIVE_LIBS) \
$(XSERVER_LIBS)
Xvesa_DEPENDENCIES = \
libvesa.a \
$(KDRIVE_LIBS)