Remove *.dir generation

It's only used by the X server's ListComponents call, which I intend to
stub out shortly.

(For bonus points, that call will fork xkbcomp to generate the necessary
 listings itself if it can't find the *.dir files.)

Signed-off-by: Daniel Stone <[email protected]>

compat/Makefile.am

@@ -1,6 +1,6 @@
 compatdir = $(xkb_base)/compat
 
-dist_compat_DATA = \
+compat_DATA = \
 accessx basic caps complete \
 iso9995 \
 japan ledcaps \
@@ -9,7 +9,4 @@ misc mousekeys \
 olpc pc pc98 xfree86 \
 xtest README
 
-dir_data = $(dist_compat_DATA)
-
-include $(top_srcdir)/xkbrules.am
-
+EXTRA_DIST = $(compat_DATA)

configure.in

@@ -14,11 +14,6 @@ AC_PROG_SED
 
 AC_SUBST(VERSION)
 
-AC_PATH_PROG([XKBCOMP], [xkbcomp], [not_found])
-if test x$XKBCOMP = xnot_found ; then
-        AC_ERROR([xkbcomp is required to install the xkb data files])
-fi
-
 AC_ARG_WITH( xkb_base,
              [AS_HELP_STRING([--with-xkb-base=DIR],[XKB base path @<:@DATADIR/X11/xkb@:>@])],
              xkb_base="$withval", 

geometry/Makefile.am

@@ -2,14 +2,12 @@ SUBDIRS = digital_vndr  sgi_vndr
 
 geomdir = $(xkb_base)/geometry
 
-dist_geom_DATA = \
+geom_DATA = \
 amiga ataritt chicony \
 dell everex fujitsu \
 hhk hp keytronic kinesis \
 macintosh microsoft nec nokia \
 northgate pc sanwa sony thinkpad \
 sun typematrix winbook README
 
-dir_data = $(dist_geom_DATA)
-
-include $(top_srcdir)/xkbrules.am
+EXTRA_DIST = $(geom_DATA)

keycodes/Makefile.am

@@ -2,7 +2,7 @@ SUBDIRS = digital_vndr sgi_vndr
 
 keycodesdir = $(xkb_base)/keycodes
 
-dist_keycodes_DATA = \
+keycodes_DATA = \
 aliases \
 amiga \
 ataritt \
@@ -18,6 +18,4 @@ xfree86 \
 xfree98 \
 README
 
-dir_data = $(dist_keycodes_DATA)
-
-include $(top_srcdir)/xkbrules.am
+EXTRA_DIST = $(keycodes_DATA)

symbols/Makefile.am

@@ -1,7 +1,7 @@
 SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
 
 symbolsdir = $(xkb_base)/symbols
-dist_symbols_DATA = \
+symbols_DATA = \
 ad af al \
 am apl ara \
 at az \
@@ -36,6 +36,4 @@ za \
 altwin capslock compose ctrl empty eurosign rupeesign group inet \
 keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
 
-dir_data = $(dist_symbols_DATA)
-
-include $(top_srcdir)/xkbrules.am
+EXTRA_DIST = $(symbols_DATA)

types/Makefile.am

@@ -1,11 +1,9 @@
 typesdir = $(xkb_base)/types
 
-dist_types_DATA = \
+types_DATA = \
 basic cancel caps \
 complete default extra \
 iso9995 level5 mousekeys nokia numpad \
 pc README
 
-dir_data = $(dist_types_DATA)
-
-include $(top_srcdir)/xkbrules.am
+EXTRA_DIST = $(types_DATA)