xserver/xkb Makefile,1.1,1.2

[Daniel Stone]

Committed by: daniel

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

Modified Files:
	Makefile 
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
===================================================================
RCS file: /cvs/xserver/xserver/xkb/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/Makefile	25 Apr 2004 13:52:20 -0000	1.1
+++ b/Makefile	3 May 2004 15:39:44 -0000	1.2
@@ -156,15 +156,15 @@
 XORGSERVER_TRUE = 
 XORG_BUS_SBUS_FALSE = 
 XORG_BUS_SBUS_TRUE = #
-XORG_CFLAGS =  -D_XOPEN_SOURCE -D_POSIX_SOURCE=500 	             -D_BSD_SOURCE -Wall -DNEED_XF86_TYPES
-XORG_CORE_LIBS = $(top_builddir)/dix/libdix.a $(top_builddir)/os/libos.a
+XORG_CFLAGS =  -D_XOPEN_SOURCE -D_POSIX_SOURCE=500 	             -D_BSD_SOURCE -Wall -DNEED_XF86_TYPES 	             -DNEED_XF86_PROTOTYPES -DXFree86Server
+XORG_CORE_LIBS = $(top_builddir)/dix/libdix.a
 XORG_INCS = -I$(top_srcdir)/hw/xorg/include \
 	-I$(top_srcdir)/hw/xorg/common \
 	-I$(top_srcdir)/hw/xorg/os-support \
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/os \
 	-I$(top_srcdir)/hw/xorg/os-support/bus -I$(top_srcdir)/Xext -I$(top_srcdir)/render -I$(top_srcdir)/randr -I$(top_srcdir)/xfixes -I$(top_srcdir)/damageext -I$(top_srcdir)/composite -I$(top_srcdir)/mi -I$(top_srcdir)/miext/damage 	           -I$(top_srcdir)/miext/shadow -I$(top_srcdir)/fb -DXTHREADS -DXUSE_MTSAFE_API -DDFLT_XKB_CONFIG_ROOT=/usr/X11R6/lib/X11/xkb -I/home/daniel/install/x/include -I/home/daniel/install/x/include/X11/fonts -I/home/daniel/install/x/include/X11/Xtrans   -I$(top_builddir)/Xi
-XORG_LIBS = $(top_builddir)/fb/libfb.a $(top_builddir)/mi/libmi.a $(top_builddir)/Xi/libXi.a $(top_builddir)/xkb/libxkb.a $(top_builddir)/Xext/libXext.a $(top_builddir)/render/librender.a $(top_builddir)/randr/librandr.a $(top_builddir)/xfixes/libxfixes.a $(top_builddir)/damageext/libdamageext.a $(top_builddir)/composite/libcomposite.a 	           $(top_builddir)/miext/damage/libdamage.a $(top_builddir)/miext/shadow/libshadow.a $(top_builddir)/dix/libxpstubs.a
+XORG_LIBS = $(top_builddir)/fb/libfb.a $(top_builddir)/mi/libmi.a $(top_builddir)/Xi/libXi.a $(top_builddir)/xkb/libxkb.a $(top_builddir)/Xext/libXext.a $(top_builddir)/render/librender.a $(top_builddir)/randr/librandr.a $(top_builddir)/xfixes/libxfixes.a $(top_builddir)/damageext/libdamageext.a $(top_builddir)/composite/libcomposite.a 	           $(top_builddir)/miext/damage/libdamage.a $(top_builddir)/miext/shadow/libshadow.a $(top_builddir)/dix/libxpstubs.a $(top_builddir)/os/libos.a
 XORG_OS = linux
 XORG_OS_SUBDIR = linux
 XSDLSERVER_FALSE =