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

    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.

9 files changed, 35 insertions, 195 deletions

diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am
index 0d1c14a11..37b5facee 100644
--- a/hw/kdrive/fbdev/Makefile.am
+++ b/hw/kdrive/fbdev/Makefile.am
@@ -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
diff --git a/hw/kdrive/linux/Makefile.am b/hw/kdrive/linux/Makefile.am
index b02ee17c2..09ae5a02e 100644
--- a/hw/kdrive/linux/Makefile.am
+++ b/hw/kdrive/linux/Makefile.am
@@ -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)
 
 
diff --git a/hw/kdrive/mach64/Makefile.am b/hw/kdrive/mach64/Makefile.am
index 66418fbd3..94b467aa2 100644
--- a/hw/kdrive/mach64/Makefile.am
+++ b/hw/kdrive/mach64/Makefile.am
@@ -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)
diff --git a/hw/kdrive/mga/Makefile.am b/hw/kdrive/mga/Makefile.am
index 68658b5fc..1fd8a6bac 100644
--- a/hw/kdrive/mga/Makefile.am
+++ b/hw/kdrive/mga/Makefile.am
@@ -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@
diff --git a/hw/kdrive/nvidia/Makefile.am b/hw/kdrive/nvidia/Makefile.am
index 0842361ca..109e42b30 100644
--- a/hw/kdrive/nvidia/Makefile.am
+++ b/hw/kdrive/nvidia/Makefile.am
@@ -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@
diff --git a/hw/kdrive/r128/Makefile.am b/hw/kdrive/r128/Makefile.am
index 5b8fc824d..e9d5d6bd0 100644
--- a/hw/kdrive/r128/Makefile.am
+++ b/hw/kdrive/r128/Makefile.am
@@ -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@
diff --git a/hw/kdrive/smi/Makefile.am b/hw/kdrive/smi/Makefile.am
index b82941319..5099ffeac 100644
--- a/hw/kdrive/smi/Makefile.am
+++ b/hw/kdrive/smi/Makefile.am
@@ -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@
diff --git a/hw/kdrive/src/Makefile.am b/hw/kdrive/src/Makefile.am
index 9f9ad1f69..9868a00d5 100644
--- a/hw/kdrive/src/Makefile.am
+++ b/hw/kdrive/src/Makefile.am
@@ -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
diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am
index 232ce9787..6ef1d2e4b 100644
--- a/hw/kdrive/vesa/Makefile.am
+++ b/hw/kdrive/vesa/Makefile.am
@@ -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)