From 72c81d5679b3f8d27bc6b3a65df1511809791c8e Mon Sep 17 00:00:00 2001 From: svu Date: Sun, 11 Apr 2004 23:13:07 +0000 Subject: First buildable version --- .cvsignore | 8 ++++++-- Makefile.am | 4 ++-- autogen.sh | 2 +- configure.in | 3 ++- rules/base | 40 +++++++++++++++++++------------------- symbols/Makefile.am | 34 ++++++++++++++++++++++++++++++++ symbols/digital.vndr/Makefile.am | 7 +++++++ symbols/fujitsu.vndr/Makefile.am | 6 ++++++ symbols/hp.vndr/Makefile.am | 6 ++++++ symbols/macintosh.vndr/Makefile.am | 10 ++++++++++ symbols/nec.vndr/Makefile.am | 6 ++++++ symbols/sgi.vndr/Makefile.am | 6 ++++++ symbols/sony.vndr/Makefile.am | 6 ++++++ symbols/sun.vndr/Makefile.am | 6 ++++++ symbols/xfree68.vndr/Makefile.am | 6 ++++++ 15 files changed, 124 insertions(+), 26 deletions(-) create mode 100644 symbols/Makefile.am create mode 100644 symbols/digital.vndr/Makefile.am create mode 100644 symbols/fujitsu.vndr/Makefile.am create mode 100644 symbols/hp.vndr/Makefile.am create mode 100644 symbols/macintosh.vndr/Makefile.am create mode 100644 symbols/nec.vndr/Makefile.am create mode 100644 symbols/sgi.vndr/Makefile.am create mode 100644 symbols/sony.vndr/Makefile.am create mode 100644 symbols/sun.vndr/Makefile.am create mode 100644 symbols/xfree68.vndr/Makefile.am diff --git a/.cvsignore b/.cvsignore index c5598eba..993ceab1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -17,8 +17,12 @@ intltool-merge.in intltool-update intltool-update.in m4 -xfree86.xml -xfree86_xkb_xml.spec autom4te.cache mkinstalldirs intltool-modules +config.h +config.h.in +stamp-h1 +xkbdesc-0.1.tar.gz +xkbdesc.spec + diff --git a/Makefile.am b/Makefile.am index 9c27edab..bce96d92 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,8 +2,8 @@ SUBDIRS = compat geometry intl keycodes keymap m4 po rules semantics symbols typ EXTRA_DIST= config.rpath mkinstalldirs config.rpath \ autogen.sh \ - xfree86_xkb_xml.spec \ - xfree86_xkb_xml.spec.in \ + xkbdesc.spec \ + xkbdesc.spec.in \ intltool-extract.in intltool-merge.in intltool-update.in ACLOCAL_AMFLAGS = -I m4 diff --git a/autogen.sh b/autogen.sh index 545f044d..79c82650 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,7 +4,7 @@ DIE=0 srcdir=`dirname $0` -PKG_NAME=xfree86_xkb_xml +PKG_NAME=xkbdesc if [ -n "$GNOME2_PATH" ]; then ACLOCAL_FLAGS="-I $GNOME2_PATH/share/aclocal $ACLOCAL_FLAGS" diff --git a/configure.in b/configure.in index fab69652..e67b7950 100644 --- a/configure.in +++ b/configure.in @@ -12,6 +12,7 @@ AC_SUBST(PACKAGE) AC_SUBST(VERSION) AC_SUBST(GETTEXT_PACKAGE) +AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE($PACKAGE, $VERSION) prefix=/usr @@ -46,7 +47,6 @@ keymap/sgi.vndr/Makefile keymap/sun.vndr/Makefile semantics/Makefile rules/Makefile -types/Makefile symbols/Makefile symbols/digital.vndr/Makefile symbols/fujitsu.vndr/Makefile @@ -57,6 +57,7 @@ symbols/sgi.vndr/Makefile symbols/sony.vndr/Makefile symbols/sun.vndr/Makefile symbols/xfree68.vndr/Makefile +types/Makefile xkbdesc.spec ]) diff --git a/rules/base b/rules/base index 927743a8..343236b1 100644 --- a/rules/base +++ b/rules/base @@ -50,7 +50,7 @@ flexpro = keytronic(FlexPro) hp6000 = hp(omnibook) omnikey101 = northgate(omnikey101) - thinkpad = ibm/thinkpad(common) + thinkpad = ibm.vndr/thinkpad(common) $pcmodels = pc(%m) jp106 = pc(jp106) everex = everex(STEPnote) @@ -61,42 +61,42 @@ * = pc(pc104) ! model variant layout = symbols - $maclaptop nodeadkeys * = macintosh/us(extended)+macintosh/%l%(v)+apple(laptop_bad_switch) - $mac nodeadkeys * = macintosh/us(extended)+macintosh/%l%(v) + $maclaptop nodeadkeys * = macintosh.vndr/us(extended)+macintosh.vndr/%l%(v)+apple(laptop_bad_switch) + $mac nodeadkeys * = macintosh.vndr/us(extended)+macintosh.vndr/%l%(v) $pcmodels nodeadkeys $oldlayouts = en_US(%m%_v)+%l%(v) * nodeadkeys $oldlayouts = en_US(pc105%_v)+%l%(v) ! model layout = symbols - pc98 nec/jp = nec/jp(pc98) - abnt2 br = pc/pc(pc104)+pc/br - $maclaptop us = macintosh/us(extended)+apple(laptop_bad_switch) - $maclaptop en_US = macintosh/us(extended)+apple(laptop_bad_switch) - $maclaptop * = macintosh/us(extended)+apple(laptop_bad_switch)+macintosh/%l%(v) - $mac us = macintosh/us(extended) - $mac en_US = macintosh/us(extended) - $mac * = macintosh/us(extended)+macintosh/%l%(v) + pc98 nec/jp = nec.vndr/jp(pc98) + abnt2 br = pc(pc104)+br + $maclaptop us = macintosh.vndr/us(extended)+apple(laptop_bad_switch) + $maclaptop en_US = macintosh.vndr/us(extended)+apple(laptop_bad_switch) + $maclaptop * = macintosh.vndr/us(extended)+apple(laptop_bad_switch)+macintosh.vndr/%l%(v) + $mac us = macintosh.vndr/us(extended) + $mac en_US = macintosh.vndr/us(extended) + $mac * = macintosh.vndr/us(extended)+macintosh.vndr/%l%(v) $pcmodels intl = us(%mcompose) * intl = us(pc104compose) * jp = jp $pcmodels $oldlayouts = en_US(%m)+%l%(v) - $pcmodels $nonlatin = pc/pc(%m)+pc/us+pc/%l%(v):2 - $pcmodels * = pc/pc(%m)+pc/%l%(v) + $pcmodels $nonlatin = pc(%m)+us+%l%(v):2 + $pcmodels * = pc(%m)+%l%(v) * $oldlayouts = en_US(pc105)+%l%(v) - * $nonlatin = pc/pc(pc105)+pc/us+pc/%l%(v):2 - * * = pc/pc(pc105)+pc/%l%(v) + * $nonlatin = pc(pc105)+us+%l%(v):2 + * * = pc(pc105)+%l%(v) ! model layout[1] = symbols - $pcmodels * = pc/pc(%m)+pc/%l[1]%(v[1]) - * * = pc/pc(pc105)+pc/%l[1]%(v[1]) + $pcmodels * = pc(%m)+%l[1]%(v[1]) + * * = pc(pc105)+%l[1]%(v[1]) ! layout[2] = symbols - * = +pc/%l[2]%(v[2]):2 + * = +%l[2]%(v[2]):2 ! layout[3] = symbols - * = +pc/%l[3]%(v[3]):3 + * = +%l[3]%(v[3]):3 ! layout[4] = symbols - * = +pc/%l[4]%(v[4]):4 + * = +%l[4]%(v[4]):4 ! $inetkbds = airkey acpi scorpius azonaRF2300 \ brother \ diff --git a/symbols/Makefile.am b/symbols/Makefile.am new file mode 100644 index 00000000..df173a15 --- /dev/null +++ b/symbols/Makefile.am @@ -0,0 +1,34 @@ +SUBDIRS = digital.vndr fujitsu.vndr hp.vndr macintosh.vndr nec.vndr sgi.vndr sony.vndr sun.vndr xfree68.vndr + +symbols_DATA = \ +al am ar \ +be ben bg \ +br by cz \ +cz_qwerty de dev \ +dk dvorak dz \ +ee el en_US \ +es fi fo \ +fr fr-latin9 gb \ +ge_la ge_ru guj \ +gur hr ie \ +il il_phonetic ir \ +is it iu \ +kan la latin \ +lo lt lv \ +mk ml mm \ +mt mt_us nl \ +no ogham ori \ +pc pl pl2 \ +pt ro ru \ +sapmi se se_FI \ +se_NO se_SE si \ +sk sk_qwerty sr \ +syr syr_phonetic tel \ +th th_pat th_tis \ +tj tml tr \ +ua us us_intl \ +uz yu + +EXTRA_DIST= $(symbols_DATA) + +symbolsdir = $(xkb_base)/symbols diff --git a/symbols/digital.vndr/Makefile.am b/symbols/digital.vndr/Makefile.am new file mode 100644 index 00000000..95bfacb7 --- /dev/null +++ b/symbols/digital.vndr/Makefile.am @@ -0,0 +1,7 @@ +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 new file mode 100644 index 00000000..b50a9c3f --- /dev/null +++ b/symbols/fujitsu.vndr/Makefile.am @@ -0,0 +1,6 @@ +symbols_DATA = \ +jp us + +EXTRA_DIST= $(symbols_DATA) + +symbolsdir = $(xkb_base)/symbols/fujitsu.vndr diff --git a/symbols/hp.vndr/Makefile.am b/symbols/hp.vndr/Makefile.am new file mode 100644 index 00000000..828ce7a6 --- /dev/null +++ b/symbols/hp.vndr/Makefile.am @@ -0,0 +1,6 @@ +symbols_DATA = \ +us + +EXTRA_DIST= $(symbols_DATA) + +symbolsdir = $(xkb_base)/symbols/hp.vndr diff --git a/symbols/macintosh.vndr/Makefile.am b/symbols/macintosh.vndr/Makefile.am new file mode 100644 index 00000000..35c56e67 --- /dev/null +++ b/symbols/macintosh.vndr/Makefile.am @@ -0,0 +1,10 @@ +symbols_DATA = \ +de de_CH dk \ +es fi fr \ +fr_CH gb 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 new file mode 100644 index 00000000..b99c920c --- /dev/null +++ b/symbols/nec.vndr/Makefile.am @@ -0,0 +1,6 @@ +symbols_DATA = \ +jp + +EXTRA_DIST= $(symbols_DATA) + +symbolsdir = $(xkb_base)/symbols/nec.vndr diff --git a/symbols/sgi.vndr/Makefile.am b/symbols/sgi.vndr/Makefile.am new file mode 100644 index 00000000..e0ad557e --- /dev/null +++ b/symbols/sgi.vndr/Makefile.am @@ -0,0 +1,6 @@ +symbols_DATA = \ +jp + +EXTRA_DIST= $(symbols_DATA) + +symbolsdir = $(xkb_base)/symbols/sgi.vndr diff --git a/symbols/sony.vndr/Makefile.am b/symbols/sony.vndr/Makefile.am new file mode 100644 index 00000000..c59c0c28 --- /dev/null +++ b/symbols/sony.vndr/Makefile.am @@ -0,0 +1,6 @@ +symbols_DATA = \ +us + +EXTRA_DIST= $(symbols_DATA) + +symbolsdir = $(xkb_base)/symbols/sony.vndr diff --git a/symbols/sun.vndr/Makefile.am b/symbols/sun.vndr/Makefile.am new file mode 100644 index 00000000..2ba5a3df --- /dev/null +++ b/symbols/sun.vndr/Makefile.am @@ -0,0 +1,6 @@ +symbols_DATA = \ +se us usb + +EXTRA_DIST= $(symbols_DATA) + +symbolsdir = $(xkb_base)/symbols/sun.vndr diff --git a/symbols/xfree68.vndr/Makefile.am b/symbols/xfree68.vndr/Makefile.am new file mode 100644 index 00000000..b0d462d9 --- /dev/null +++ b/symbols/xfree68.vndr/Makefile.am @@ -0,0 +1,6 @@ +symbols_DATA = \ +amiga ataritt + +EXTRA_DIST= $(symbols_DATA) + +symbolsdir = $(xkb_base)/symbols/xfree68.vndr -- cgit v1.2.3