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

[Daniel Stone]

Committed by: daniel

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

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/input/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:11 -0000	1.1
+++ b/Makefile.am	3 May 2004 15:39:44 -0000	1.2
@@ -2,8 +2,10 @@
 
 libinput_a_SOURCES = drvConf.c
 
+SUBDIRS = mouse
+
 drvConf.c:
-	sh $(srcdir)/confdrv.sh
+	sh $(srcdir)/confdrv.sh $(SUBDIRS)
 DISTCLEANFILES = drvConf.c
 
 AM_CFLAGS = $(XORG_CFLAGS)