svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .

1 files changed, 121 insertions, 86 deletions

diff --git a/xorg-server/xkbdata.src/rules/Makefile.in b/xorg-server/xkbdata.src/rules/Makefile.in
index bc498f1d1..583a1ce8f 100644
--- a/xorg-server/xkbdata.src/rules/Makefile.in
+++ b/xorg-server/xkbdata.src/rules/Makefile.in
@@ -175,60 +175,37 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 xkb_base = @xkb_base@
 xkb_rules_symlink = @xkb_rules_symlink@
-SUBDIRS = compat
-base_parts_no_compat = base.hdr.part base.lists.part \
-HDR base.m_k.part \
-HDR base.l1_k.part \
-HDR base.l_k.part \
-HDR base.ml_g.part \
-HDR base.m_g.part \
-HDR base.mlv_s.part \
-HDR base.ml_s.part \
-HDR base.ml1_s.part \
-HDR \
-HDR base.l2_s.part \
-HDR base.l3_s.part \
-HDR base.l4_s.part \
-HDR HDR HDR \
-HDR base.m_s.part \
-HDR base.ml_c.part \
-HDR base.ml1_c.part \
-HDR base.m_t.part \
-HDR base.l1o_s.part \
-HDR base.l2o_s.part \
-HDR base.l3o_s.part \
-HDR base.l4o_s.part \
-HDR base.o_s.part \
-HDR base.o_c.part \
-HDR base.o_t.part
-
-evdev_parts_no_compat = base.hdr.part base.lists.part \
-HDR evdev.m_k.part \
-HDR base.l1_k.part \
-HDR base.l_k.part  \
-HDR base.ml_g.part \
-HDR base.m_g.part \
-HDR base.mlv_s.part \
-HDR base.ml_s.part \
-HDR base.ml1_s.part \
-HDR \
-HDR base.l2_s.part \
-HDR base.l3_s.part \
-HDR base.l4_s.part \
-HDR HDR HDR \
-HDR evdev.m_s.part \
-HDR base.ml_c.part \
-HDR base.ml1_c.part \
-HDR base.m_t.part \
-HDR base.l1o_s.part \
-HDR base.l2o_s.part \
-HDR base.l3o_s.part \
-HDR base.l4o_s.part \
-HDR base.o_s.part \
-HDR base.o_c.part \
-HDR base.o_t.part
-
-@USE_COMPAT_RULES_FALSE@base_parts = $(base_parts_no_compat)
+SUBDIRS = bin compat extras
+@USE_COMPAT_RULES_FALSE@base_parts = base.hdr.part base.lists.part \
+@USE_COMPAT_RULES_FALSE@HDR base.m_k.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l1_k.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l_k.part \
+@USE_COMPAT_RULES_FALSE@HDR \
+@USE_COMPAT_RULES_FALSE@HDR base.ml_g.part \
+@USE_COMPAT_RULES_FALSE@HDR base.m_g.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.mlv_s.part   base.mlv_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.ml_s.part    base.ml_s.part  \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1_s.part   base.ml1_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1v1_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l2_s.part    base.l2_s.part  \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l3_s.part    base.l3_s.part  \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l4_s.part    base.l4_s.part  \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l2v2_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l3v3_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l4v4_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.m_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.ml_c.part \
+@USE_COMPAT_RULES_FALSE@HDR base.ml1_c.part \
+@USE_COMPAT_RULES_FALSE@HDR base.m_t.part \
+@USE_COMPAT_RULES_FALSE@HDR \
+@USE_COMPAT_RULES_FALSE@HDR base.l1o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l2o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l3o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l4o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.o_c.part \
+@USE_COMPAT_RULES_FALSE@HDR base.o_t.part
+
 @USE_COMPAT_RULES_TRUE@base_parts = base.hdr.part base.lists.part \
 @USE_COMPAT_RULES_TRUE@compat/base.lists.part \
 @USE_COMPAT_RULES_TRUE@HDR base.m_k.part \
@@ -237,16 +214,16 @@ HDR base.o_t.part
 @USE_COMPAT_RULES_TRUE@HDR base.o_k.part \
 @USE_COMPAT_RULES_TRUE@HDR base.ml_g.part \
 @USE_COMPAT_RULES_TRUE@HDR base.m_g.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part base.mlv_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part base.ml_s.part  \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part base.ml1_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part base.l2_s.part  \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part base.l3_s.part  \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part base.l4_s.part  \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part   extras/base.mlv_s.part   base.mlv_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part    extras/base.ml_s.part    base.ml_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part   extras/base.ml1_s.part   base.ml1_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part    extras/base.l2_s.part    base.l2_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part    extras/base.l3_s.part    base.l3_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part    extras/base.l4_s.part    base.l4_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part  extras/base.l2v2_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part  extras/base.l3v3_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part  extras/base.l4v4_s.part \
 @USE_COMPAT_RULES_TRUE@HDR base.m_s.part \
 @USE_COMPAT_RULES_TRUE@HDR base.ml_c.part \
 @USE_COMPAT_RULES_TRUE@HDR base.ml1_c.part \
@@ -256,11 +233,40 @@ HDR base.o_t.part
 @USE_COMPAT_RULES_TRUE@HDR base.l2o_s.part \
 @USE_COMPAT_RULES_TRUE@HDR base.l3o_s.part \
 @USE_COMPAT_RULES_TRUE@HDR base.l4o_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part     base.o_s.part \
 @USE_COMPAT_RULES_TRUE@HDR base.o_c.part \
 @USE_COMPAT_RULES_TRUE@HDR base.o_t.part
 
-@USE_COMPAT_RULES_FALSE@evdev_parts = $(base_parts_no_compat)
+@USE_COMPAT_RULES_FALSE@evdev_parts = base.hdr.part base.lists.part \
+@USE_COMPAT_RULES_FALSE@HDR evdev.m_k.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l1_k.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l_k.part  \
+@USE_COMPAT_RULES_FALSE@HDR \
+@USE_COMPAT_RULES_FALSE@HDR base.ml_g.part \
+@USE_COMPAT_RULES_FALSE@HDR base.m_g.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.mlv_s.part   base.mlv_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.ml_s.part    base.ml_s.part  \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1_s.part   base.ml1_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.ml1v1_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l2_s.part    base.l2_s.part  \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l3_s.part    base.l3_s.part  \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l4_s.part    base.l4_s.part  \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l2v2_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l3v3_s.part \
+@USE_COMPAT_RULES_FALSE@HDR extras/base.l4v4_s.part \
+@USE_COMPAT_RULES_FALSE@HDR evdev.m_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.ml_c.part \
+@USE_COMPAT_RULES_FALSE@HDR base.ml1_c.part \
+@USE_COMPAT_RULES_FALSE@HDR base.m_t.part \
+@USE_COMPAT_RULES_FALSE@HDR \
+@USE_COMPAT_RULES_FALSE@HDR base.l1o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l2o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l3o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.l4o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.o_s.part \
+@USE_COMPAT_RULES_FALSE@HDR base.o_c.part \
+@USE_COMPAT_RULES_FALSE@HDR base.o_t.part
+
 @USE_COMPAT_RULES_TRUE@evdev_parts = base.hdr.part base.lists.part \
 @USE_COMPAT_RULES_TRUE@compat/base.lists.part \
 @USE_COMPAT_RULES_TRUE@HDR evdev.m_k.part \
@@ -269,16 +275,16 @@ HDR base.o_t.part
 @USE_COMPAT_RULES_TRUE@HDR base.o_k.part \
 @USE_COMPAT_RULES_TRUE@HDR base.ml_g.part \
 @USE_COMPAT_RULES_TRUE@HDR base.m_g.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part base.mlv_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part base.ml_s.part  \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part base.ml1_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part base.l2_s.part  \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part base.l3_s.part  \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part base.l4_s.part  \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.mlv_s.part   extras/base.mlv_s.part   base.mlv_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml_s.part    extras/base.ml_s.part    base.ml_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1_s.part   extras/base.ml1_s.part   base.ml1_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l2_s.part    extras/base.l2_s.part    base.l2_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l3_s.part    extras/base.l3_s.part    base.l3_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l4_s.part    extras/base.l4_s.part    base.l4_s.part  \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l2v2_s.part  extras/base.l2v2_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l3v3_s.part  extras/base.l3v3_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.l4v4_s.part  extras/base.l4v4_s.part \
 @USE_COMPAT_RULES_TRUE@HDR evdev.m_s.part \
 @USE_COMPAT_RULES_TRUE@HDR base.ml_c.part \
 @USE_COMPAT_RULES_TRUE@HDR base.ml1_c.part \
@@ -288,25 +294,51 @@ HDR base.o_t.part
 @USE_COMPAT_RULES_TRUE@HDR base.l2o_s.part \
 @USE_COMPAT_RULES_TRUE@HDR base.l3o_s.part \
 @USE_COMPAT_RULES_TRUE@HDR base.l4o_s.part \
-@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part base.o_s.part \
+@USE_COMPAT_RULES_TRUE@HDR compat/base.o_s.part     base.o_s.part \
 @USE_COMPAT_RULES_TRUE@HDR base.o_c.part \
 @USE_COMPAT_RULES_TRUE@HDR base.o_t.part
 
-base_parts_compat_dist = base.o_k.part base.lo_s.part
+all_parts_dist = HDR base.hdr.part \
+base.lists.part \
+base.m_k.part \
+base.l1_k.part \
+base.l_k.part \
+base.o_k.part \
+base.ml_g.part \
+base.m_g.part \
+base.mlv_s.part \
+base.ml_s.part \
+base.ml1_s.part \
+base.l2_s.part \
+base.l3_s.part \
+base.l4_s.part \
+base.m_s.part \
+base.ml_c.part \
+base.ml1_c.part \
+base.m_t.part \
+base.lo_s.part \
+base.l1o_s.part \
+base.l2o_s.part \
+base.l3o_s.part \
+base.l4o_s.part \
+base.o_s.part \
+base.o_c.part \
+base.o_t.part \
+evdev.m_k.part \
+evdev.m_s.part
+
 rules_files = base evdev xfree98
 lst_files = base.lst evdev.lst
 dist_files = xkb.dtd README
 rules_DATA = $(rules_files) $(lst_files) $(dist_files)
-xml_in_files = base.xml.in evdev.xml.in
+xml_in_files = base.xml.in evdev.xml.in base.extras.xml.in evdev.extras.xml.in
 xml_DATA = $(xml_in_files:.xml.in=.xml) 
 EXTRA_DIST = $(xml_in_files) xfree98 \
-            $(base_parts_no_compat) \
-            $(evdev_parts_no_compat) \
-            $(base_parts_compat_dist) \
+            $(all_parts_dist) \
             xml2lst.pl merge.sh $(dist_files)
 
-CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst
-MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in
+CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst base.extras.xml evdev.extras.xml
+MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in $(srcdir)/evdev.extras.xml.in
 rulesdir = $(xkb_base)/rules
 xmldir = $(rulesdir)
 all: all-recursive
@@ -676,15 +708,18 @@ uninstall-am: uninstall-rulesDATA uninstall-xmlDATA
 %.lst: %.xml
 	perl $(srcdir)/xml2lst.pl < $< > $@
 
-base: $(base_parts_no_compat)
+base: $(base_parts)
 	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts)
 
-evdev: $(evdev_parts_no_compat)
+evdev: $(evdev_parts)
 	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts)
 
 $(srcdir)/evdev.xml.in: base.xml.in
 	cp $< $@
 
+$(srcdir)/evdev.extras.xml.in: base.extras.xml.in
+	cp $< $@
+
 @INTLTOOL_XML_NOMERGE_RULE@
 # 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.