diff options
28 files changed, 113 insertions, 137 deletions
@@ -1,5 +1,11 @@ 2005-08-04 svu + * *Makefile.am, configure.in, xkbrules.am: + Taking nice ideas from xkbdata. + Thanks to Daniel Stone for his knowledge of autofoo + +2005-08-04 svu + * symbols/in, symbols/lk, rules/base.xml.in, rules/compat/variantRename.lst: a bit reogranizing tamil stuff diff --git a/Makefile.am b/Makefile.am index bd393a0e..d4ffb92e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +AUTOMAKE_OPTIONS = foreign + SUBDIRS = compat geometry keycodes keymap po rules semantics symbols types docs EXTRA_DIST=config.rpath COPYING CREDITS README \ diff --git a/compat/Makefile.am b/compat/Makefile.am index ea4b3a65..f8dd837a 100644 --- a/compat/Makefile.am +++ b/compat/Makefile.am @@ -1,4 +1,6 @@ -compat_DATA = \ +compatdir = $(xkb_base)/compat + +dist_compat_DATA = \ accessx basic complete \ default iso9995 \ japan keypad ledcaps \ @@ -6,9 +8,6 @@ lednum ledscroll \ misc mousekeys norepeat \ pc pc98 xfree86 \ xtest README - -EXTRA_DIST= $(compat_DATA) - -compatdir = $(xkb_base)/compat +include $(top_srcdir)/xkbrules.am diff --git a/configure.in b/configure.in index 722fc286..ceace643 100644 --- a/configure.in +++ b/configure.in @@ -1,22 +1,17 @@ -AC_INIT(rules/base.xml.in) +AC_INIT(xkeyboard-config, 0.5) +AC_CONFIG_SRCDIR(rules/base.xml.in) +AM_INIT_AUTOMAKE([dist-bzip2]) +AM_MAINTAINER_MODE -PACKAGE=xkeyboard-config -GETTEXT_PACKAGE=$PACKAGE -MAJOR_VERSION=0 -MINOR_VERSION=5 -VERSION=$MAJOR_VERSION.$MINOR_VERSION - -AC_SUBST(MAJOR_VERSION) -AC_SUBST(MINOR_VERSION) -AC_SUBST(PACKAGE) AC_SUBST(VERSION) -AC_SUBST(GETTEXT_PACKAGE) - -AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE($PACKAGE, $VERSION) prefix=/usr +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, [ --with-xkb-base=DIR XKB base path (by default it is /usr/X11R6/lib/X11/xkb)], xkb_base="$withval", @@ -43,8 +38,7 @@ AM_CONDITIONAL(CREATE_XKBCOMP_SYMLINK, test "x$enable_xkbcomp_symlink" == "xyes" AM_CONDITIONAL(USE_COMPAT_RULES, test "x$enable_compat_rules" == "xyes") AC_PROG_INTLTOOL(0.30) -dnl AM_GNU_GETTEXT([external]) -dnl AM_GNU_GETTEXT() + ALL_LINGUAS="af az bg cs da el en_GB fr hu nl ru rw sk sq sr sv tr uk vi zh_CN" AC_SUBST(xkb_base) diff --git a/geometry/Makefile.am b/geometry/Makefile.am index c0593756..26a19c0a 100644 --- a/geometry/Makefile.am +++ b/geometry/Makefile.am @@ -1,6 +1,8 @@ SUBDIRS = digital_vndr ibm_vndr sgi_vndr -geom_DATA = \ +geomdir = $(xkb_base)/geometry + +dist_geom_DATA = \ amiga ataritt chicony \ dell everex fujitsu \ hp keytronic kinesis \ @@ -8,8 +10,4 @@ macintosh microsoft nec \ northgate pc sony \ sun winbook README -EXTRA_DIST= $(geom_DATA) - -geomdir = $(xkb_base)/geometry - - +include $(top_srcdir)/xkbrules.am diff --git a/geometry/digital_vndr/Makefile.am b/geometry/digital_vndr/Makefile.am index 24535df2..821c0ccf 100644 --- a/geometry/digital_vndr/Makefile.am +++ b/geometry/digital_vndr/Makefile.am @@ -1,6 +1,4 @@ -geom_DATA = \ -lk pc unix - -EXTRA_DIST= $(geom_DATA) - geomdir = $(xkb_base)/geometry/digital_vndr + +dist_geom_DATA = \ +lk pc unix diff --git a/geometry/ibm_vndr/Makefile.am b/geometry/ibm_vndr/Makefile.am index 6e80f01f..84130ace 100644 --- a/geometry/ibm_vndr/Makefile.am +++ b/geometry/ibm_vndr/Makefile.am @@ -1,6 +1,4 @@ -geom_DATA = \ -thinkpad - -EXTRA_DIST= $(geom_DATA) - geomdir = $(xkb_base)/geometry/ibm_vndr + +dist_geom_DATA = \ +thinkpad diff --git a/geometry/sgi_vndr/Makefile.am b/geometry/sgi_vndr/Makefile.am index 52ce17d7..5c76e4b4 100644 --- a/geometry/sgi_vndr/Makefile.am +++ b/geometry/sgi_vndr/Makefile.am @@ -1,6 +1,4 @@ -geom_DATA = \ -indigo indy O2 - -EXTRA_DIST= $(geom_DATA) - geomdir = $(xkb_base)/geometry/sgi_vndr + +dist_geom_DATA = \ +indigo indy O2 diff --git a/keycodes/Makefile.am b/keycodes/Makefile.am index 75629d2a..d9af6c00 100644 --- a/keycodes/Makefile.am +++ b/keycodes/Makefile.am @@ -1,12 +1,12 @@ SUBDIRS = digital_vndr sgi_vndr -kc_DATA = \ +keycodesdir = $(xkb_base)/keycodes + +dist_keycodes_DATA = \ aliases amiga ataritt \ fujitsu hp ibm \ macintosh powerpcps2 sony \ sun xfree86 xfree98 \ README - -EXTRA_DIST= $(kc_DATA) - -kcdir = $(xkb_base)/keycodes + +include $(top_srcdir)/xkbrules.am diff --git a/keycodes/digital_vndr/Makefile.am b/keycodes/digital_vndr/Makefile.am index 471f8bbd..4f4cc4fd 100644 --- a/keycodes/digital_vndr/Makefile.am +++ b/keycodes/digital_vndr/Makefile.am @@ -1,6 +1,4 @@ -kc_DATA = \ +keycodesdir = $(xkb_base)/keycodes/digital_vndr + +dist_keycodes_DATA = \ lk pc - -EXTRA_DIST= $(kc_DATA) - -kcdir = $(xkb_base)/keycodes/digital_vndr diff --git a/keycodes/sgi_vndr/Makefile.am b/keycodes/sgi_vndr/Makefile.am index 9cf7804b..f601268e 100644 --- a/keycodes/sgi_vndr/Makefile.am +++ b/keycodes/sgi_vndr/Makefile.am @@ -1,6 +1,4 @@ -kc_DATA = \ +keycodesdir = $(xkb_base)/keycodes/sgi_vndr + +dist_keycodes_DATA = \ indigo indy iris - -EXTRA_DIST= $(kc_DATA) - -kcdir = $(xkb_base)/keycodes/sgi_vndr diff --git a/keymap/Makefile.am b/keymap/Makefile.am index 7a1c1121..621e5c8f 100644 --- a/keymap/Makefile.am +++ b/keymap/Makefile.am @@ -1,10 +1,10 @@ SUBDIRS = digital_vndr sgi_vndr sun_vndr -km_DATA = \ +keymapdir = $(xkb_base)/keymap + +dist_keymap_DATA = \ amiga ataritt macintosh \ sony xfree86 xfree98 \ README - -EXTRA_DIST= $(km_DATA) - -kmdir = $(xkb_base)/keymap + +include $(top_srcdir)/xkbrules.am diff --git a/keymap/digital_vndr/Makefile.am b/keymap/digital_vndr/Makefile.am index b17bbe33..b1961e5b 100644 --- a/keymap/digital_vndr/Makefile.am +++ b/keymap/digital_vndr/Makefile.am @@ -1,8 +1,4 @@ -km_DATA = \ -us - -EXTRA_DIST= $(km_DATA) - -kmdir = $(xkb_base)/keymap/digital_vndr - +keymapdir = $(xkb_base)/keymap/digital_vndr +dist_keymap_DATA = \ +us diff --git a/keymap/sgi_vndr/Makefile.am b/keymap/sgi_vndr/Makefile.am index 4acb4f2a..234a336d 100644 --- a/keymap/sgi_vndr/Makefile.am +++ b/keymap/sgi_vndr/Makefile.am @@ -1,4 +1,6 @@ -km_DATA = \ +keymapdir = $(xkb_base)/keymap/sgi_vndr + +dist_keymap_DATA = \ be bg ca \ ch cz de \ dk dvorak \ @@ -8,7 +10,3 @@ hu it jp \ no pl pt \ ru se sk \ th us - -EXTRA_DIST= $(km_DATA) - -kmdir = $(xkb_base)/keymap/sgi_vndr diff --git a/keymap/sun_vndr/Makefile.am b/keymap/sun_vndr/Makefile.am index 47953c4b..0049ad96 100644 --- a/keymap/sun_vndr/Makefile.am +++ b/keymap/sun_vndr/Makefile.am @@ -1,9 +1,7 @@ -km_DATA = \ +keymapdir = $(xkb_base)/keymap/sun_vndr + +dist_keymap_DATA = \ de es fi \ fr no pl \ ru se uk \ us - -EXTRA_DIST= $(km_DATA) - -kmdir = $(xkb_base)/keymap/sun_vndr diff --git a/semantics/Makefile.am b/semantics/Makefile.am index 78309557..75cd1895 100644 --- a/semantics/Makefile.am +++ b/semantics/Makefile.am @@ -1,7 +1,7 @@ -sem_DATA = \ +semanticsdir = $(xkb_base)/semantics + +dist_semantics_DATA = \ basic complete default \ xtest - -EXTRA_DIST= $(sem_DATA) - -semdir = $(xkb_base)/semantics + +include $(top_srcdir)/xkbrules.am diff --git a/symbols/Makefile.am b/symbols/Makefile.am index ef29101b..f130f506 100644 --- a/symbols/Makefile.am +++ b/symbols/Makefile.am @@ -1,6 +1,7 @@ SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr -symbols_DATA = \ +symbolsdir = $(xkb_base)/symbols +dist_symbols_DATA = \ al am ara \ az be bd \ bg br ba bt \ @@ -28,6 +29,4 @@ uz vn \ altwin capslock compose ctrl group inet keypad level3 srvr_ctrl \ eurosign -EXTRA_DIST= $(symbols_DATA) - -symbolsdir = $(xkb_base)/symbols +include $(top_srcdir)/xkbrules.am diff --git a/symbols/digital_vndr/Makefile.am b/symbols/digital_vndr/Makefile.am index 8ae7f356..063fc8d5 100644 --- a/symbols/digital_vndr/Makefile.am +++ b/symbols/digital_vndr/Makefile.am @@ -1,7 +1,5 @@ -symbols_DATA = \ +symbolsdir = $(xkb_base)/symbols/digital_vndr + +dist_symbols_DATA = \ lk pc us \ vt - -EXTRA_DIST= $(symbols_DATA) - -symbolsdir = $(xkb_base)/symbols/digital_vndr diff --git a/symbols/fujitsu_vndr/Makefile.am b/symbols/fujitsu_vndr/Makefile.am index 801bbf1a..4e3a96ee 100644 --- a/symbols/fujitsu_vndr/Makefile.am +++ b/symbols/fujitsu_vndr/Makefile.am @@ -1,6 +1,4 @@ -symbols_DATA = \ -jp us - -EXTRA_DIST= $(symbols_DATA) - symbolsdir = $(xkb_base)/symbols/fujitsu_vndr + +dist_symbols_DATA = \ +jp us diff --git a/symbols/hp_vndr/Makefile.am b/symbols/hp_vndr/Makefile.am index d874bb6d..6bcd4da3 100644 --- a/symbols/hp_vndr/Makefile.am +++ b/symbols/hp_vndr/Makefile.am @@ -1,6 +1,4 @@ -symbols_DATA = \ -us - -EXTRA_DIST= $(symbols_DATA) - symbolsdir = $(xkb_base)/symbols/hp_vndr + +dist_symbols_DATA = \ +us diff --git a/symbols/macintosh_vndr/Makefile.am b/symbols/macintosh_vndr/Makefile.am index 35d75c77..e2375d68 100644 --- a/symbols/macintosh_vndr/Makefile.am +++ b/symbols/macintosh_vndr/Makefile.am @@ -1,10 +1,8 @@ -symbols_DATA = \ +symbolsdir = $(xkb_base)/symbols/macintosh_vndr + +dist_symbols_DATA = \ apple ch de dk \ es fi fr \ gb is it \ nl no pt \ se us - -EXTRA_DIST= $(symbols_DATA) - -symbolsdir = $(xkb_base)/symbols/macintosh_vndr diff --git a/symbols/nec_vndr/Makefile.am b/symbols/nec_vndr/Makefile.am index 2de14206..ff070065 100644 --- a/symbols/nec_vndr/Makefile.am +++ b/symbols/nec_vndr/Makefile.am @@ -1,6 +1,4 @@ -symbols_DATA = \ -jp - -EXTRA_DIST= $(symbols_DATA) - symbolsdir = $(xkb_base)/symbols/nec_vndr + +dist_symbols_DATA = \ +jp diff --git a/symbols/sgi_vndr/Makefile.am b/symbols/sgi_vndr/Makefile.am index d16aa2b6..b1123e70 100644 --- a/symbols/sgi_vndr/Makefile.am +++ b/symbols/sgi_vndr/Makefile.am @@ -1,6 +1,4 @@ -symbols_DATA = \ -jp - -EXTRA_DIST= $(symbols_DATA) - symbolsdir = $(xkb_base)/symbols/sgi_vndr + +dist_symbols_DATA = \ +jp diff --git a/symbols/sony_vndr/Makefile.am b/symbols/sony_vndr/Makefile.am index 06ad913f..e1a77d95 100644 --- a/symbols/sony_vndr/Makefile.am +++ b/symbols/sony_vndr/Makefile.am @@ -1,6 +1,4 @@ -symbols_DATA = \ -us - -EXTRA_DIST= $(symbols_DATA) - symbolsdir = $(xkb_base)/symbols/sony_vndr + +dist_symbols_DATA = \ +us diff --git a/symbols/sun_vndr/Makefile.am b/symbols/sun_vndr/Makefile.am index af2a2580..488c4193 100644 --- a/symbols/sun_vndr/Makefile.am +++ b/symbols/sun_vndr/Makefile.am @@ -1,6 +1,4 @@ -symbols_DATA = \ -se us usb - -EXTRA_DIST= $(symbols_DATA) - symbolsdir = $(xkb_base)/symbols/sun_vndr + +dist_symbols_DATA = \ +se us usb diff --git a/symbols/xfree68_vndr/Makefile.am b/symbols/xfree68_vndr/Makefile.am index 66669a80..50be49bb 100644 --- a/symbols/xfree68_vndr/Makefile.am +++ b/symbols/xfree68_vndr/Makefile.am @@ -1,6 +1,4 @@ -symbols_DATA = \ -amiga ataritt - -EXTRA_DIST= $(symbols_DATA) - symbolsdir = $(xkb_base)/symbols/xfree68_vndr + +dist_symbols_DATA = \ +amiga ataritt diff --git a/types/Makefile.am b/types/Makefile.am index ba1ee769..19f1c5ef 100644 --- a/types/Makefile.am +++ b/types/Makefile.am @@ -1,9 +1,9 @@ -types_DATA = \ +typesdir = $(xkb_base)/types + +dist_types_DATA = \ basic cancel caps \ complete default extra \ iso9995 mousekeys numpad \ pc README -EXTRA_DIST= $(types_DATA) - -typesdir = $(xkb_base)/types +include $(top_srcdir)/xkbrules.am diff --git a/xkbrules.am b/xkbrules.am new file mode 100644 index 00000000..48ef07ff --- /dev/null +++ b/xkbrules.am @@ -0,0 +1,14 @@ +# Common rules for building *.dir files in all xkb subdirectories +# Replaces Imake's MakeXkbDir() rule +# svu: taken from xkbdata + +MOSTLYCLEANFILES = $(subdir).dir + +dir_DATA = $(subdir).dir + +dirdir = $(xkb_base) + +$(subdir).dir: + -rm -f $@ + $(XKBCOMP) -lfhlpR -o $@ '*' + |