aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkbdata.src/rules/compat
diff options
context:
space:
mode:
Diffstat (limited to 'xorg-server/xkbdata.src/rules/compat')
-rw-r--r--xorg-server/xkbdata.src/rules/compat/Makefile.am55
-rw-r--r--xorg-server/xkbdata.src/rules/compat/Makefile.in54
-rw-r--r--xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst (renamed from xorg-server/xkbdata.src/rules/compat/layoutRename.lst)0
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ln_s.sh20
-rw-r--r--xorg-server/xkbdata.src/rules/compat/lnv_s.sh12
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ml1_s.sh18
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh10
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ml1v_s.sh10
-rw-r--r--xorg-server/xkbdata.src/rules/compat/ml_s.sh14
-rw-r--r--xorg-server/xkbdata.src/rules/compat/mlv_s.sh10
-rw-r--r--xorg-server/xkbdata.src/rules/compat/variantsMapping.lst (renamed from xorg-server/xkbdata.src/rules/compat/variantRename.lst)1
11 files changed, 48 insertions, 156 deletions
diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.am b/xorg-server/xkbdata.src/rules/compat/Makefile.am
index 20bf3d9a1..755be6d07 100644
--- a/xorg-server/xkbdata.src/rules/compat/Makefile.am
+++ b/xorg-server/xkbdata.src/rules/compat/Makefile.am
@@ -1,17 +1,10 @@
-transform_files=layoutRename.lst variantRename.lst
-
-transform_scripts= \
-ln_s.sh \
-lnv_s.sh \
-ml_s.sh \
-mlv_s.sh \
-ml1_s.sh \
-ml1v_s.sh \
-ml1v1_s.sh
+transform_files=layoutsMapping.lst variantsMapping.lst
dist_parts=base.o_s.part
+scripts_dir=$(srcdir)/../bin
+
scripts= \
base.l2_s.part \
base.l3_s.part \
@@ -35,36 +28,36 @@ noinst_SCRIPTS=
endif
-base.l2_s.part: ln_s.sh $(transform_files)
- sh $< 2
+base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+ sh $< 2 $(srcdir)
-base.l3_s.part: ln_s.sh $(transform_files)
- sh $< 3
+base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+ sh $< 3 $(srcdir)
-base.l4_s.part: ln_s.sh $(transform_files)
- sh $< 4
+base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+ sh $< 4 $(srcdir)
-base.l2v2_s.part: lnv_s.sh $(transform_files)
- sh $< 2
+base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+ sh $< 2 $(srcdir)
-base.l3v3_s.part: lnv_s.sh $(transform_files)
- sh $< 3
+base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+ sh $< 3 $(srcdir)
-base.l4v4_s.part: lnv_s.sh $(transform_files)
- sh $< 4
+base.l4v4_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+ sh $< 4 $(srcdir)
-base.ml_s.part: ml_s.sh $(transform_files)
- sh $<
+base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files)
+ sh $< $(srcdir)
-base.ml1_s.part: ml1_s.sh $(transform_files)
- sh $<
+base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files)
+ sh $< $(srcdir)
-base.mlv_s.part: mlv_s.sh $(transform_files)
- sh $<
+base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files)
+ sh $< $(srcdir)
-base.ml1v1_s.part: ml1v1_s.sh $(transform_files)
- sh $<
+base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files)
+ sh $< $(srcdir)
-EXTRA_DIST=base.lists.part $(transform_files) $(transform_scripts) $(dist_parts)
+EXTRA_DIST=base.lists.part $(transform_files) $(dist_parts)
CLEANFILES=$(scripts)
diff --git a/xorg-server/xkbdata.src/rules/compat/Makefile.in b/xorg-server/xkbdata.src/rules/compat/Makefile.in
index 1488a728d..f78214247 100644
--- a/xorg-server/xkbdata.src/rules/compat/Makefile.in
+++ b/xorg-server/xkbdata.src/rules/compat/Makefile.in
@@ -154,17 +154,9 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
xkb_base = @xkb_base@
xkb_rules_symlink = @xkb_rules_symlink@
-transform_files = layoutRename.lst variantRename.lst
-transform_scripts = \
-ln_s.sh \
-lnv_s.sh \
-ml_s.sh \
-mlv_s.sh \
-ml1_s.sh \
-ml1v_s.sh \
-ml1v1_s.sh
-
+transform_files = layoutsMapping.lst variantsMapping.lst
dist_parts = base.o_s.part
+scripts_dir = $(srcdir)/../bin
scripts = \
base.l2_s.part \
base.l3_s.part \
@@ -180,7 +172,7 @@ base.ml_s.part
@USE_COMPAT_RULES_FALSE@noinst_SCRIPTS =
@USE_COMPAT_RULES_TRUE@noinst_SCRIPTS = $(scripts) $(dist_parts)
-EXTRA_DIST = base.lists.part $(transform_files) $(transform_scripts) $(dist_parts)
+EXTRA_DIST = base.lists.part $(transform_files) $(dist_parts)
CLEANFILES = $(scripts)
all: all-am
@@ -343,35 +335,35 @@ uninstall-am:
mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
-base.l2_s.part: ln_s.sh $(transform_files)
- sh $< 2
+base.l2_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+ sh $< 2 $(srcdir)
-base.l3_s.part: ln_s.sh $(transform_files)
- sh $< 3
+base.l3_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+ sh $< 3 $(srcdir)
-base.l4_s.part: ln_s.sh $(transform_files)
- sh $< 4
+base.l4_s.part: $(scripts_dir)/ln_s.sh $(transform_files)
+ sh $< 4 $(srcdir)
-base.l2v2_s.part: lnv_s.sh $(transform_files)
- sh $< 2
+base.l2v2_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+ sh $< 2 $(srcdir)
-base.l3v3_s.part: lnv_s.sh $(transform_files)
- sh $< 3
+base.l3v3_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+ sh $< 3 $(srcdir)
-base.l4v4_s.part: lnv_s.sh $(transform_files)
- sh $< 4
+base.l4v4_s.part: $(scripts_dir)/lnv_s.sh $(transform_files)
+ sh $< 4 $(srcdir)
-base.ml_s.part: ml_s.sh $(transform_files)
- sh $<
+base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files)
+ sh $< $(srcdir)
-base.ml1_s.part: ml1_s.sh $(transform_files)
- sh $<
+base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files)
+ sh $< $(srcdir)
-base.mlv_s.part: mlv_s.sh $(transform_files)
- sh $<
+base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files)
+ sh $< $(srcdir)
-base.ml1v1_s.part: ml1v1_s.sh $(transform_files)
- sh $<
+base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files)
+ sh $< $(srcdir)
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/xorg-server/xkbdata.src/rules/compat/layoutRename.lst b/xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst
index cecda6d8a..cecda6d8a 100644
--- a/xorg-server/xkbdata.src/rules/compat/layoutRename.lst
+++ b/xorg-server/xkbdata.src/rules/compat/layoutsMapping.lst
diff --git a/xorg-server/xkbdata.src/rules/compat/ln_s.sh b/xorg-server/xkbdata.src/rules/compat/ln_s.sh
deleted file mode 100644
index 7e17d8851..000000000
--- a/xorg-server/xkbdata.src/rules/compat/ln_s.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-variant=$1
-
-INDIR=`dirname $0`
-OUTFILE=base.l${variant}_s.part
-
-> $OUTFILE
-
-awk '{
- if (index($2, "(") == 0) {
- printf " %s = +%s%%(v['${variant}']):'${variant}'\n", $1, $2;
- } else {
- printf " %s = +%s:'${variant}'\n", $1, $2;
- }
-}' < $INDIR/layoutRename.lst >> $OUTFILE
-
-awk '{
- printf " %s(%s) = +%s(%s):'${variant}'\n", $1, $2, $3, $4;
-}' < $INDIR/variantRename.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/compat/lnv_s.sh b/xorg-server/xkbdata.src/rules/compat/lnv_s.sh
deleted file mode 100644
index ae699f95b..000000000
--- a/xorg-server/xkbdata.src/rules/compat/lnv_s.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-variant=$1
-
-INDIR=`dirname $0`
-OUTFILE=base.l${variant}v${variant}_s.part
-
-> $OUTFILE
-
-awk '{
- printf " %s %s = +%s(%s):'${variant}'\n", $1, $2, $3, $4;
-}' < $INDIR/variantRename.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
deleted file mode 100644
index 327de2d9c..000000000
--- a/xorg-server/xkbdata.src/rules/compat/ml1_s.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-INDIR=`dirname $0`
-OUTFILE=base.ml1_s.part
-
-> $OUTFILE
-
-awk '{
- if (index($2, "(") == 0) {
- printf " * %s = pc+%s%%(v[1])\n", $1, $2;
- } else {
- printf " * %s = pc+%s\n", $1, $2;
- }
-}' < $INDIR/layoutRename.lst >> $OUTFILE
-
-awk '{
- printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantRename.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh
deleted file mode 100644
index 9edcb8e8c..000000000
--- a/xorg-server/xkbdata.src/rules/compat/ml1v1_s.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-INDIR=`dirname $0`
-OUTFILE=base.ml1v1_s.part
-
-> $OUTFILE
-
-awk '{
- printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantRename.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh b/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh
deleted file mode 100644
index 02ae5726d..000000000
--- a/xorg-server/xkbdata.src/rules/compat/ml1v_s.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-INDIR=`dirname $0`
-OUTFILE=base.ml1v_s.part
-
-> $OUTFILE
-
-awk '{
- printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantRename.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/compat/ml_s.sh b/xorg-server/xkbdata.src/rules/compat/ml_s.sh
deleted file mode 100644
index f35087380..000000000
--- a/xorg-server/xkbdata.src/rules/compat/ml_s.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-INDIR=`dirname $0`
-OUTFILE=base.ml_s.part
-
-> $OUTFILE
-
-awk '{
- printf " * %s = pc+%s\n", $1, $2;
-}' < $INDIR/layoutRename.lst >> $OUTFILE
-
-awk '{
- printf " * %s(%s) = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantRename.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/compat/mlv_s.sh b/xorg-server/xkbdata.src/rules/compat/mlv_s.sh
deleted file mode 100644
index ea644dcab..000000000
--- a/xorg-server/xkbdata.src/rules/compat/mlv_s.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-INDIR=`dirname $0`
-OUTFILE=base.mlv_s.part
-
-> $OUTFILE
-
-awk '{
- printf " * %s %s = pc+%s(%s)\n", $1, $2, $3, $4;
-}' < $INDIR/variantRename.lst >> $OUTFILE
diff --git a/xorg-server/xkbdata.src/rules/compat/variantRename.lst b/xorg-server/xkbdata.src/rules/compat/variantsMapping.lst
index f85a2d0a8..be2a2bc40 100644
--- a/xorg-server/xkbdata.src/rules/compat/variantRename.lst
+++ b/xorg-server/xkbdata.src/rules/compat/variantsMapping.lst
@@ -40,6 +40,7 @@ syr basic sy syc
syr phonetic sy syc_phonetic
tam INSCRIPT in tam
tam UNI in tam_unicode
+tam NUMERAL-KEYBOARD in tam_keyboard_with_numerals
tam TAB in tam_TAB
tam TSCII in tam_TSCII
tel basic in tel
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 23:12:55 +0000