From 67804fe9398ac1bda8bbed40dcf65dd7ce734364 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 28 Aug 2012 10:39:57 -0700 Subject: [PATCH] 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 --- compat/Makefile.am | 7 ++----- configure.in | 5 ----- geometry/Makefile.am | 6 ++---- keycodes/Makefile.am | 6 ++---- symbols/Makefile.am | 6 ++---- types/Makefile.am | 6 ++---- xkbrules.am | 14 -------------- 7 files changed, 10 insertions(+), 40 deletions(-) delete mode 100644 xkbrules.am diff --git a/compat/Makefile.am b/compat/Makefile.am index aeed932..e2026af 100644 --- a/compat/Makefile.am +++ b/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) diff --git a/configure.in b/configure.in index 83e25b9..a43c379 100644 --- a/configure.in +++ b/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", diff --git a/geometry/Makefile.am b/geometry/Makefile.am index 2a83d16..069a953 100644 --- a/geometry/Makefile.am +++ b/geometry/Makefile.am @@ -2,7 +2,7 @@ SUBDIRS = digital_vndr sgi_vndr geomdir = $(xkb_base)/geometry -dist_geom_DATA = \ +geom_DATA = \ amiga ataritt chicony \ dell everex fujitsu \ hhk hp keytronic kinesis \ @@ -10,6 +10,4 @@ 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) diff --git a/keycodes/Makefile.am b/keycodes/Makefile.am index 68c9a54..9c5a386 100644 --- a/keycodes/Makefile.am +++ b/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) diff --git a/symbols/Makefile.am b/symbols/Makefile.am index ecd9f25..ddcb480 100644 --- a/symbols/Makefile.am +++ b/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) diff --git a/types/Makefile.am b/types/Makefile.am index 6da3ccb..0084184 100644 --- a/types/Makefile.am +++ b/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) diff --git a/xkbrules.am b/xkbrules.am deleted file mode 100644 index d8ee781..0000000 --- a/xkbrules.am +++ /dev/null @@ -1,14 +0,0 @@ -# Common rules for building *.dir files in all xkb subdirectories -# Replaces Imake's MakeXkbDir() rule -# svu: taken from xkbdata - -dist_dir_DATA = $(subdir).dir - -dirdir = $(xkb_base) - -$(subdir).dir: $(dir_data) - -rm -f $@ - $(XKBCOMP) -lfhlpR -o $@ '*' - -CLEANFILES = $(subdir).dir - -- 2.32.0.93.g670b81a890