xserver/hw/xorg/os-support/linux Makefile.am,1.1,1.2

[Daniel Stone]

Committed by: daniel

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

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/os-support/linux/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:14 -0000	1.1
+++ b/Makefile.am	3 May 2004 15:39:44 -0000	1.2
@@ -13,12 +13,12 @@
                            ../shared/vidmem.c ../shared/sigio.c \
                            ../shared/stdResource.c \
                            ../../common/xf86PM.c ../misc/SlowBcopy.c
-libxorglinux_a_LIBADD = int10/libxorglinuxint10.a \
-                          $(DRI_LIBS)
+#libxorglinux_a_LIBADD = int10/libxorglinuxint10.a \
+#                         $(DRI_LIBS)
 
 sdk_INCLUDEDIR = $(includedir)/xorg
 sdk_INCLUDES = agpgart.h
 INCLUDES = $(XORG_INCS)
 AM_CFLAGS = $(XORG_CFLAGS) -DUSESTDRES -DXFree86Server
 
-SUBDIRS = int10 $(DRI_SUBDIRS)
+SUBDIRS = $(DRI_SUBDIRS)