Serious reorganization of the generation scripts in rules

Now, the autogen scrtipts are shared among 'compat' and 'extras' rules. The schema
of the code generation is shared (actually, Makefile.am files are
identical). The whole process should be a bit more transparent and
correct now.

Also, rs(combiningkeys) is added,
http://bugs.freedesktop.org/show_bug.cgi?id=21047

10 files changed, 24 insertions, 125 deletions

diff --git a/rules/compat/Makefile.am b/rules/compat/Makefile.am
index 20bf3d9..755be6d 100644
--- a/rules/compat/Makefile.am
+++ b/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/rules/compat/layoutRename.lst b/rules/compat/layoutsMapping.lst
index cecda6d..cecda6d 100644
--- a/rules/compat/layoutRename.lst
+++ b/rules/compat/layoutsMapping.lst
diff --git a/rules/compat/ln_s.sh b/rules/compat/ln_s.sh
deleted file mode 100755
index 7e17d88..0000000
--- a/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/rules/compat/lnv_s.sh b/rules/compat/lnv_s.sh
deleted file mode 100755
index ae699f9..0000000
--- a/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/rules/compat/ml1_s.sh b/rules/compat/ml1_s.sh
deleted file mode 100755
index 327de2d..0000000
--- a/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/rules/compat/ml1v1_s.sh b/rules/compat/ml1v1_s.sh
deleted file mode 100755
index 9edcb8e..0000000
--- a/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/rules/compat/ml1v_s.sh b/rules/compat/ml1v_s.sh
deleted file mode 100755
index 02ae572..0000000
--- a/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/rules/compat/ml_s.sh b/rules/compat/ml_s.sh
deleted file mode 100755
index f350873..0000000
--- a/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/rules/compat/mlv_s.sh b/rules/compat/mlv_s.sh
deleted file mode 100755
index ea644dc..0000000
--- a/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/rules/compat/variantRename.lst b/rules/compat/variantsMapping.lst
index f85a2d0..f85a2d0 100644
--- a/rules/compat/variantRename.lst
+++ b/rules/compat/variantsMapping.lst