--- ../xkb.orig/Makefile.am	2005-10-07 13:33:16.067154232 +0300
+++ ./Makefile.am	2005-10-07 14:01:44.294464208 +0300
@@ -2,6 +2,8 @@
 
 AM_CFLAGS = $(DIX_CFLAGS)
 
+INCLUDES = -I$(top_srcdir)/xkb/libxkbfile
+
 DDX_SRCS = \
         ddxBeep.c \
         ddxCtrls.c \
@@ -30,24 +32,14 @@
         xkbPrKeyEv.c
 
 # this should be replaced by a common library or something, ideally -d
-XKBFILE_SRCS = \
-        maprules.c \
-        xkmread.c \
-        xkbtext.c \
-        xkbfmisc.c \
-        xkberrs.c \
-        xkbconfig.c \
-        xkbout.c
-
-X11_SRCS = \
-        XKBMisc.c \
-        XKBAlloc.c \
-        XKBGAlloc.c \
-        XKBMAlloc.c
+SUBDIRS = libxkbfile libX11
+
+libxkb_la_LIBADD = \
+	libxkbfile/libxkbfile.la \
+	libX11/libX11.la
 
 XI_SRCS = xkbPrOtherEv.c
 
-libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS) $(XKBFILE_SRCS) \
-                    $(X11_SRCS)
+libxkb_la_SOURCES = $(DDX_SRCS) $(DIX_SRCS) $(XI_SRCS)
 
 EXTRA_DIST = xkb.h xkbDflts.h
--- ../xkb.orig/libxkbfile/Makefile.am	2005-10-07 15:18:01.564613376 +0300
+++ ./libxkbfile/Makefile.am	2005-10-07 14:57:56.510809400 +0300
@@ -0,0 +1,16 @@
+noinst_LTLIBRARIES = libxkbfile.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+INCLUDES = -I$(top_srcdir)/xkb/ -I$(top_srcdir)/xkb/libxkbfile
+
+XKBFILE_SRCS = \
+        maprules.c \
+        xkmread.c \
+        xkbtext.c \
+        xkbmisc.c \
+        xkberrs.c \
+        xkbconfig.c \
+        xkbout.c
+
+libxkbfile_la_SOURCES = $(XKBFILE_SRCS)
--- ../xkb.orig/libX11/Makefile.am	2005-10-07 15:18:05.447023160 +0300
+++ ./libX11/Makefile.am	2005-10-07 14:52:33.253951912 +0300
@@ -0,0 +1,13 @@
+noinst_LTLIBRARIES = libX11.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+INCLUDES = -I$(top_srcdir)/xkb/libxkbfile
+
+X11_SRCS = \
+        XKBMisc.c \
+        XKBAlloc.c \
+        XKBGAlloc.c \
+        XKBMAlloc.c
+
+libX11_la_SOURCES = $(X11_SRCS)