xserver/xkb Makefile.am,1.1,1.2 xkbInit.c,1.1,1.2

[Carlos Romero]

Committed by: kidcrash

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

Modified Files:
	Makefile.am xkbInit.c 
Log Message:
Initial kdrive XKB/XINPUT support, use --enable-xkb --enable-xinput


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xserver/xkb/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	25 Apr 2004 13:52:20 -0000	1.1
+++ Makefile.am	7 Jul 2004 19:21:07 -0000	1.2
@@ -13,10 +13,7 @@
         ddxList.c \
         ddxConfig.c \
         ddxDevBtn.c \
-        ddxPrivate.c \
-        xf86KillSrv.c \
-        xf86VT.c \
-        xf86Private.c
+        ddxPrivate.c
 DIX_SRCS = \
         xkb.c \
         xkbUtils.c \
@@ -45,11 +42,7 @@
 libxkb_a_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS) $(XKBFILE_SRCS) \
                    $(X11_SRCS)
 
-xf86%.c:
-	echo "#define XF86DDXACTIONS" > $@
-	echo "#include \"$(srcdir)/ddx$*.c\"" >> $@
-
 AM_CFLAGS = -DXKB_DFLT_DISABLED=0 -DXKB_IN_SERVER \
             -DXKB_BASE_DIRECTORY=\"$(LIBDIR)/xkb\" -DXKB
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../mi -I$(srcdir)/../hw/xorg/common \
+INCLUDES = $(XORG_INCS) $(KDRIVE_INCS) -I$(srcdir)/../mi -I$(srcdir)/../hw/xorg/common \
            -I$(srcdir)/../hw/xorg/include -I$(srcdir)/../hw/xorg/os-support/bus

Index: xkbInit.c
===================================================================
RCS file: /cvs/xserver/xserver/xkb/xkbInit.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xkbInit.c	25 Apr 2004 13:52:20 -0000	1.1
+++ xkbInit.c	7 Jul 2004 19:21:07 -0000	1.2
@@ -88,9 +88,9 @@
 
 /***====================================================================***/
 
-#ifndef XKB_BASE_DIRECTORY
+//#ifndef XKB_BASE_DIRECTORY
 #define	XKB_BASE_DIRECTORY	"/usr/lib/X11/xkb"
-#endif
+//#endif
 #ifndef XKB_DFLT_RULES_FILE
 #define	XKB_DFLT_RULES_FILE	"rules"
 #endif