xserver/hw/xorg Makefile.am,1.1,1.2

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	Makefile.am 
Log Message:

	* configure.ac:
	* hw/xorg/Makefile.am:
	* hw/xorg/drivers/Makefile.am:
	* hw/xorg/drivers/fbdev:
	* hw/xorg/input/Makefile.am:
	* hw/xorg/input/mouse:
	Import fbdev and mouse drivers.

	* hw/xorg/common/xf86cmap.c:
	Test for whether pmap is !NULL, rather than just blindly calling
	CMapReinstallMap. This seems to break things, but meh.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/hw/xorg/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/Makefile.am	25 Apr 2004 13:52:09 -0000	1.1
+++ b/Makefile.am	3 May 2004 15:39:43 -0000	1.2
@@ -13,9 +13,11 @@
           os-support/libxorgos.a
 
 DRIVER_LIBS = drivers/libdrivers.a \
-              drivers/ati/libati.a
+              drivers/ati/libati.a \
+              drivers/fbdev/libfbdev.a
 
-INPUT_LIBS = input/libinput.a
+INPUT_LIBS = input/libinput.a \
+             input/mouse/libmouse.a
 
 XORG_LIBS = \
             @XORG_CORE_LIBS@ \