xserver/hw Makefile.am,1.6,1.7

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xserver/hw
In directory pdx:/tmp/cvs-serv724/hw

Modified Files:
	Makefile.am 
Log Message:
2004-06-04  Keith Packard  <keithp at keithp.com>

	* configure.ac:
	* hw/Makefile.am:
	Add top-level build support for GL X server (not working yet)

	* composite/compinit.c: (compAddAlternateVisuals):
	Fix a few allocation bugs with alternate visual ids
	Allow for non-8/8/8 alternate visuals
	
	* hw/kdrive/src/kshadow.c: (KdShadowSet):
	Turn off any existing shadow before enabling it again
	(avoids re-registering existing damage)

	* miext/damage/damage.c: (damageRemoveDamage),
	(damageInsertDamage), (DamageRegister), (DamageUnregister):
	Add some validation code to catch re-registered damages


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/Makefile.am	25 Apr 2004 08:45:27 -0000	1.6
+++ b/Makefile.am	4 Jun 2004 16:10:50 -0000	1.7
@@ -14,8 +14,13 @@
 XORG_SUBDIRS = xorg
 endif
 
+if XGLSERVER
+XGL_SUBDIRS = xgl
+endif
+
 SUBDIRS =			\
 	$(KDRIVE_SUBDIRS)	\
 	$(XNEST_SUBDIRS)	\
 	$(XWIN_SUBDIRS)		\
-	$(XORG_SUBDIRS)
+	$(XORG_SUBDIRS)		\
+	$(XGL_SUBDIRS)