svn merge ^/branches/released .

7 files changed, 315 insertions, 401 deletions

diff --git a/xorg-server/xkeyboard-config/rules/Makefile.am b/xorg-server/xkeyboard-config/rules/Makefile.am
index 6ca04e7fa..dcf9e3d90 100644
--- a/xorg-server/xkeyboard-config/rules/Makefile.am
+++ b/xorg-server/xkeyboard-config/rules/Makefile.am
@@ -1,236 +1,236 @@
-SUBDIRS = bin compat extras
-
-if CREATE_RULES_SYMLINK
-#  extra_rules_file = $(xkb_rules_symlink)
-#  extra_dir_file   = $(extra_rules_file).xml 
-#  extra_lst_file   = $(extra_rules_file).lst
-
-install-data-hook:
-	for file in `echo "$(xkb_rules_symlink)" | sed 's/,/ /'` ; do \
-		extra_rules_file=$$file ; \
-		extra_dir_file=$$extra_rules_file.xml ; \
-		extra_lst_file=$$extra_rules_file.lst ; \
-		ln -sf base     $(DESTDIR)$(rulesdir)/$$extra_rules_file ; \
-		ln -sf base.lst $(DESTDIR)$(rulesdir)/$$extra_lst_file ; \
-		ln -sf base.xml $(DESTDIR)$(rulesdir)/$$extra_dir_file ; \
-	done
-
-else
-install-data-hook:
-
-endif
-
-if USE_COMPAT_RULES
-
-base_parts = base.hdr.part base.lists.part \
-compat/base.lists.part \
-HDR base.m_k.part \
-HDR base.l1_k.part \
-HDR base.l_k.part \
-HDR base.o_k.part \
-HDR base.ml_g.part \
-HDR base.m_g.part \
-HDR compat/base.mlv_s.part   extras/base.mlv_s.part   base.mlv_s.part \
-HDR compat/base.ml_s.part    extras/base.ml_s.part    base.ml_s.part  \
-HDR compat/base.ml1_s.part   extras/base.ml1_s.part   base.ml1_s.part \
-HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
-HDR compat/base.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \
-HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \
-HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \
-HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
-HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
-HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
-HDR base.m_s.part \
-HDR compat/base.lv_c.part   \
-HDR compat/base.l1v1_c.part \
-HDR compat/base.l2v2_c.part \
-HDR compat/base.l3v3_c.part \
-HDR compat/base.l4v4_c.part \
-HDR base.ml_c.part \
-HDR base.ml1_c.part \
-HDR base.m_t.part \
-HDR base.lo_s.part \
-HDR base.l1o_s.part \
-HDR base.l2o_s.part \
-HDR base.l3o_s.part \
-HDR base.l4o_s.part \
-HDR compat/base.o_s.part     base.o_s.part \
-HDR base.o_c.part \
-HDR base.o_t.part
-
-evdev_parts = base.hdr.part base.lists.part \
-compat/base.lists.part \
-HDR evdev.m_k.part \
-HDR base.l1_k.part \
-HDR base.l_k.part \
-HDR base.o_k.part \
-HDR base.ml_g.part \
-HDR base.m_g.part \
-HDR compat/base.mlv_s.part   extras/base.mlv_s.part   base.mlv_s.part \
-HDR compat/base.ml_s.part    extras/base.ml_s.part    base.ml_s.part  \
-HDR compat/base.ml1_s.part   extras/base.ml1_s.part   base.ml1_s.part \
-HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
-HDR compat/base.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \
-HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \
-HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \
-HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
-HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
-HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
-HDR evdev.m_s.part \
-HDR compat/base.lv_c.part   \
-HDR compat/base.l1v1_c.part \
-HDR compat/base.l2v2_c.part \
-HDR compat/base.l3v3_c.part \
-HDR compat/base.l4v4_c.part \
-HDR base.ml_c.part \
-HDR base.ml1_c.part \
-HDR base.m_t.part \
-HDR base.lo_s.part \
-HDR base.l1o_s.part \
-HDR base.l2o_s.part \
-HDR base.l3o_s.part \
-HDR base.l4o_s.part \
-HDR compat/base.o_s.part     base.o_s.part \
-HDR base.o_c.part \
-HDR base.o_t.part
-
-else
-
-base_parts = base.hdr.part base.lists.part \
-HDR base.m_k.part \
-HDR base.l1_k.part \
-HDR base.l_k.part \
-HDR \
-HDR base.ml_g.part \
-HDR base.m_g.part \
-HDR extras/base.mlv_s.part   base.mlv_s.part \
-HDR extras/base.ml_s.part    base.ml_s.part  \
-HDR extras/base.ml1_s.part   base.ml1_s.part \
-HDR extras/base.ml1v1_s.part \
-HDR extras/base.ml2_s.part    base.ml2_s.part  \
-HDR extras/base.ml3_s.part    base.ml3_s.part  \
-HDR extras/base.ml4_s.part    base.ml4_s.part  \
-HDR extras/base.ml2v2_s.part \
-HDR extras/base.ml3v3_s.part \
-HDR extras/base.ml4v4_s.part \
-HDR base.m_s.part \
-HDR \
-HDR \
-HDR \
-HDR \
-HDR \
-HDR base.ml_c.part \
-HDR base.ml1_c.part \
-HDR base.m_t.part \
-HDR \
-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 = base.hdr.part base.lists.part \
-HDR evdev.m_k.part \
-HDR base.l1_k.part \
-HDR base.l_k.part  \
-HDR \
-HDR base.ml_g.part \
-HDR base.m_g.part \
-HDR extras/base.mlv_s.part   base.mlv_s.part \
-HDR extras/base.ml_s.part    base.ml_s.part  \
-HDR extras/base.ml1_s.part   base.ml1_s.part \
-HDR extras/base.ml1v1_s.part \
-HDR extras/base.ml2_s.part    base.ml2_s.part  \
-HDR extras/base.ml3_s.part    base.ml3_s.part  \
-HDR extras/base.ml4_s.part    base.ml4_s.part  \
-HDR extras/base.ml2v2_s.part \
-HDR extras/base.ml3v3_s.part \
-HDR extras/base.ml4v4_s.part \
-HDR evdev.m_s.part \
-HDR \
-HDR \
-HDR \
-HDR \
-HDR \
-HDR base.ml_c.part \
-HDR base.ml1_c.part \
-HDR base.m_t.part \
-HDR \
-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
-
-endif
-
-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.ml2_s.part \
-base.ml3_s.part \
-base.ml4_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
-
-%.lst: %.xml
-	perl $(srcdir)/xml2lst.pl < $< > $@
-
-base: $(base_parts)
-	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts)
-
-evdev: $(evdev_parts)
-	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts)
-
-dist_files = xkb.dtd README
-
-rules_DATA = $(rules_files) $(lst_files) $(dist_files)
-
-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) 
-
-$(srcdir)/evdev.xml.in: base.xml.in
-	cp $< $@
-
-$(srcdir)/evdev.extras.xml.in: base.extras.xml.in
-	cp $< $@
-
-EXTRA_DIST= $(xml_in_files) xfree98 \
-            $(all_parts_dist) \
-            xml2lst.pl merge.sh $(dist_files)
-
-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)
-
-@INTLTOOL_XML_NOMERGE_RULE@
+SUBDIRS = bin compat

+

+if CREATE_RULES_SYMLINK

+#  extra_rules_file = $(xkb_rules_symlink)

+#  extra_dir_file   = $(extra_rules_file).xml 

+#  extra_lst_file   = $(extra_rules_file).lst

+

+install-data-hook:

+	for file in `echo "$(xkb_rules_symlink)" | sed 's/,/ /'` ; do \

+		extra_rules_file=$$file ; \

+		extra_dir_file=$$extra_rules_file.xml ; \

+		extra_lst_file=$$extra_rules_file.lst ; \

+		ln -sf base     $(DESTDIR)$(rulesdir)/$$extra_rules_file ; \

+		ln -sf base.lst $(DESTDIR)$(rulesdir)/$$extra_lst_file ; \

+		ln -sf base.xml $(DESTDIR)$(rulesdir)/$$extra_dir_file ; \

+	done

+

+else

+install-data-hook:

+

+endif

+

+if USE_COMPAT_RULES

+

+base_parts = base.hdr.part base.lists.part \

+compat/base.lists.part \

+HDR base.m_k.part \

+HDR base.l1_k.part \

+HDR base.l_k.part \

+HDR base.o_k.part \

+HDR base.ml_g.part \

+HDR base.m_g.part \

+HDR compat/base.mlv_s.part   base.mlv_s.part \

+HDR compat/base.ml_s.part    base.ml_s.part  \

+HDR compat/base.ml1_s.part   base.ml1_s.part \

+HDR compat/base.ml1v1_s.part \

+HDR compat/base.ml2_s.part    base.ml2_s.part  \

+HDR compat/base.ml3_s.part    base.ml3_s.part  \

+HDR compat/base.ml4_s.part    base.ml4_s.part  \

+HDR compat/base.ml2v2_s.part  \

+HDR compat/base.ml3v3_s.part  \

+HDR compat/base.ml4v4_s.part  \

+HDR base.m_s.part \

+HDR compat/base.lv_c.part   \

+HDR compat/base.l1v1_c.part \

+HDR compat/base.l2v2_c.part \

+HDR compat/base.l3v3_c.part \

+HDR compat/base.l4v4_c.part \

+HDR base.ml_c.part \

+HDR base.ml1_c.part \

+HDR base.m_t.part \

+HDR base.lo_s.part \

+HDR base.l1o_s.part \

+HDR base.l2o_s.part \

+HDR base.l3o_s.part \

+HDR base.l4o_s.part \

+HDR compat/base.o_s.part     base.o_s.part \

+HDR base.o_c.part \

+HDR base.o_t.part

+

+evdev_parts = base.hdr.part base.lists.part \

+compat/base.lists.part \

+HDR evdev.m_k.part \

+HDR base.l1_k.part \

+HDR base.l_k.part \

+HDR base.o_k.part \

+HDR base.ml_g.part \

+HDR base.m_g.part \

+HDR compat/base.mlv_s.part   base.mlv_s.part \

+HDR compat/base.ml_s.part    base.ml_s.part  \

+HDR compat/base.ml1_s.part   base.ml1_s.part \

+HDR compat/base.ml1v1_s.part \

+HDR compat/base.ml2_s.part    base.ml2_s.part  \

+HDR compat/base.ml3_s.part    base.ml3_s.part  \

+HDR compat/base.ml4_s.part    base.ml4_s.part  \

+HDR compat/base.ml2v2_s.part  \

+HDR compat/base.ml3v3_s.part  \

+HDR compat/base.ml4v4_s.part  \

+HDR evdev.m_s.part \

+HDR compat/base.lv_c.part   \

+HDR compat/base.l1v1_c.part \

+HDR compat/base.l2v2_c.part \

+HDR compat/base.l3v3_c.part \

+HDR compat/base.l4v4_c.part \

+HDR base.ml_c.part \

+HDR base.ml1_c.part \

+HDR base.m_t.part \

+HDR base.lo_s.part \

+HDR base.l1o_s.part \

+HDR base.l2o_s.part \

+HDR base.l3o_s.part \

+HDR base.l4o_s.part \

+HDR compat/base.o_s.part     base.o_s.part \

+HDR base.o_c.part \

+HDR base.o_t.part

+

+else

+

+base_parts = base.hdr.part base.lists.part \

+HDR base.m_k.part \

+HDR base.l1_k.part \

+HDR base.l_k.part \

+HDR \

+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.ml2_s.part  \

+HDR base.ml3_s.part  \

+HDR base.ml4_s.part  \

+HDR \

+HDR \

+HDR \

+HDR base.m_s.part \

+HDR \

+HDR \

+HDR \

+HDR \

+HDR \

+HDR base.ml_c.part \

+HDR base.ml1_c.part \

+HDR base.m_t.part \

+HDR \

+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 = base.hdr.part base.lists.part \

+HDR evdev.m_k.part \

+HDR base.l1_k.part \

+HDR base.l_k.part  \

+HDR \

+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.ml2_s.part  \

+HDR base.ml3_s.part  \

+HDR base.ml4_s.part  \

+HDR \

+HDR \

+HDR \

+HDR evdev.m_s.part \

+HDR \

+HDR \

+HDR \

+HDR \

+HDR \

+HDR base.ml_c.part \

+HDR base.ml1_c.part \

+HDR base.m_t.part \

+HDR \

+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

+

+endif

+

+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.ml2_s.part \

+base.ml3_s.part \

+base.ml4_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

+

+%.lst: %.xml

+	perl $(srcdir)/xml2lst.pl < $< > $@

+

+base: $(base_parts)

+	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(base_parts)

+

+evdev: $(evdev_parts)

+	HDR="$(srcdir)/HDR" $(srcdir)/merge.sh $@ $(evdev_parts)

+

+dist_files = xkb.dtd README

+

+rules_DATA = $(rules_files) $(lst_files) $(dist_files)

+

+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) 

+

+$(srcdir)/evdev.xml.in: base.xml.in

+	cp $< $@

+

+$(srcdir)/evdev.extras.xml.in: base.extras.xml.in

+	cp $< $@

+

+EXTRA_DIST= $(xml_in_files) xfree98 \

+            $(all_parts_dist) \

+            xml2lst.pl merge.sh $(dist_files)

+

+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)

+

+@INTLTOOL_XML_NOMERGE_RULE@

diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
index 107aa6c1c..f72e4cf95 100644
--- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in
+++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in
@@ -67,6 +67,22 @@
     </layout>

     <layout>

       <configItem>

+        <name>ro</name>

+        <_shortDescription>Rou</_shortDescription>

+        <_description>Romania</_description>

+        <languageList><iso639Id>rum</iso639Id></languageList>

+      </configItem>

+      <variantList>

+        <variant>

+          <configItem>

+            <name>ergonomic</name>

+            <_description>Ergonomic Touchtype</_description>

+          </configItem>

+        </variant>

+      </variantList>

+    </layout>

+    <layout>

+      <configItem>

         <name>rs</name>

         <_shortDescription>SRB</_shortDescription>

         <_description>Serbia</_description>

diff --git a/xorg-server/xkeyboard-config/rules/extras/Makefile.am b/xorg-server/xkeyboard-config/rules/extras/Makefile.am
deleted file mode 100644
index 0387a868c..000000000
--- a/xorg-server/xkeyboard-config/rules/extras/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-transform_files=layoutsMapping.lst variantsMapping.lst

-

-scripts_dir=$(srcdir)/../bin

-

-scripts= \

-base.ml2_s.part \

-base.ml3_s.part \

-base.ml4_s.part \

-base.ml2v2_s.part \

-base.ml3v3_s.part \

-base.ml4v4_s.part \

-base.ml_s.part \

-base.ml1_s.part \

-base.mlv_s.part \

-base.ml1v1_s.part

-

-noinst_SCRIPTS=$(scripts)

-

-base.ml2_s.part: $(scripts_dir)/mln_s.sh $(transform_files)

-	sh $< 2 $(srcdir)

-

-base.ml3_s.part: $(scripts_dir)/mln_s.sh $(transform_files)

-	sh $< 3 $(srcdir)

-

-base.ml4_s.part: $(scripts_dir)/mln_s.sh $(transform_files)

-	sh $< 4 $(srcdir)

-

-base.ml2v2_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)

-	sh $< 2 $(srcdir)

-

-base.ml3v3_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)

-	sh $< 3 $(srcdir)

-

-base.ml4v4_s.part: $(scripts_dir)/mlnvn_s.sh $(transform_files)

-	sh $< 4 $(srcdir)

-

-base.ml_s.part: $(scripts_dir)/ml_s.sh $(transform_files)

-	sh $< $(srcdir)

-

-base.ml1_s.part: $(scripts_dir)/ml1_s.sh $(transform_files)

-	sh $< $(srcdir)

-

-base.mlv_s.part: $(scripts_dir)/mlv_s.sh $(transform_files)

-	sh $< $(srcdir)

-

-base.ml1v1_s.part: $(scripts_dir)/ml1v1_s.sh $(transform_files)

-	sh $< $(srcdir)

-

-EXTRA_DIST=$(transform_files)

-

-CLEANFILES=$(scripts)

diff --git a/xorg-server/xkeyboard-config/rules/extras/layoutsMapping.lst b/xorg-server/xkeyboard-config/rules/extras/layoutsMapping.lst
deleted file mode 100644
index d75b4f44d..000000000
--- a/xorg-server/xkeyboard-config/rules/extras/layoutsMapping.lst
+++ /dev/null
@@ -1 +0,0 @@
-apl	extras/apl
diff --git a/xorg-server/xkeyboard-config/rules/extras/makefile b/xorg-server/xkeyboard-config/rules/extras/makefile
deleted file mode 100644
index 5c837dbf1..000000000
--- a/xorg-server/xkeyboard-config/rules/extras/makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-transform_files=layoutsMapping.lst variantsMapping.lst
-
-scripts_dir=..\bin
-
-SCRIPTS= \
-base.ml2_s.part \
-base.ml3_s.part \
-base.ml4_s.part \
-base.ml2v2_s.part \
-base.ml3v3_s.part \
-base.ml4v4_s.part \
-base.ml_s.part \
-base.ml1_s.part \
-base.mlv_s.part \
-base.ml1v1_s.part
-
-SH=cmd /c
-
-base.ml2_s.part: mln_s.bat $(transform_files)
-	$(SH) $< 2
-
-base.ml3_s.part: mln_s.bat $(transform_files)
-	$(SH) $< 3
-
-base.ml4_s.part: mln_s.bat $(transform_files)
-	$(SH) $< 4
-
-base.ml2v2_s.part: mlnvn_s.bat $(transform_files)
-	$(SH) $< 2
-
-base.ml3v3_s.part: mlnvn_s.bat $(transform_files)
-	$(SH) $< 3
-
-base.ml4v4_s.part: mlnvn_s.bat $(transform_files)
-	$(SH) $< 4
-
-base.ml_s.part: ml_s.bat $(transform_files)
-	$(SH) $<
-
-base.ml1_s.part: ml1_s.bat $(transform_files)
-	$(SH) $<
-
-base.mlv_s.part: mlv_s.bat $(transform_files)
-	$(SH) $<
-
-base.ml1v1_s.part: ml1v1_s.bat $(transform_files)
-	$(SH) $<
-
-%.bat: $(scripts_dir)\%.sh
-	copy $< $@
-
-all=$(SCRIPTS)
diff --git a/xorg-server/xkeyboard-config/rules/extras/variantsMapping.lst b/xorg-server/xkeyboard-config/rules/extras/variantsMapping.lst
deleted file mode 100644
index fd0add719..000000000
--- a/xorg-server/xkeyboard-config/rules/extras/variantsMapping.lst
+++ /dev/null
@@ -1,6 +0,0 @@
-rs	combiningkeys	extras/rs	combiningkeys

-ru	chu		extras/ru	chu

-ir	ave		extras/ir	ave

-us	alt-intl-unicode	extras/us	alt-intl-unicode

-us	crd		extras/us	crd

-us	intl-unicode	extras/us	intl-unicode

diff --git a/xorg-server/xkeyboard-config/rules/makefile b/xorg-server/xkeyboard-config/rules/makefile
index 6b822c4c9..c8b2f25c2 100644
--- a/xorg-server/xkeyboard-config/rules/makefile
+++ b/xorg-server/xkeyboard-config/rules/makefile
@@ -3,11 +3,14 @@ $(error Please do not specify MAKESERVER=1)
 endif
 
 load_makefile compat\makefile DEBUG=$(DEBUG)
-load_makefile extras\makefile DEBUG=$(DEBUG)
 
 DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\rules
 
-BASE_PARTS_NO_COMPAT = base.hdr.part base.lists.part \
+USE_COMPAT_RULES = 1
+
+if USE_COMPAT_RULES
+
+base_parts = base.hdr.part base.lists.part \
 compat/base.lists.part \
 HDR base.m_k.part \
 HDR base.l1_k.part \
@@ -15,16 +18,16 @@ HDR base.l_k.part \
 HDR base.o_k.part \
 HDR base.ml_g.part \
 HDR base.m_g.part \
-HDR compat/base.mlv_s.part   extras/base.mlv_s.part   base.mlv_s.part \
-HDR compat/base.ml_s.part    extras/base.ml_s.part    base.ml_s.part  \
-HDR compat/base.ml1_s.part   extras/base.ml1_s.part   base.ml1_s.part \
-HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
-HDR compat/base.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \
-HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \
-HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \
-HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
-HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
-HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
+HDR compat/base.mlv_s.part   base.mlv_s.part \
+HDR compat/base.ml_s.part    base.ml_s.part  \
+HDR compat/base.ml1_s.part   base.ml1_s.part \
+HDR compat/base.ml1v1_s.part \
+HDR compat/base.ml2_s.part    base.ml2_s.part  \
+HDR compat/base.ml3_s.part    base.ml3_s.part  \
+HDR compat/base.ml4_s.part    base.ml4_s.part  \
+HDR compat/base.ml2v2_s.part  \
+HDR compat/base.ml3v3_s.part  \
+HDR compat/base.ml4v4_s.part  \
 HDR base.m_s.part \
 HDR compat/base.lv_c.part   \
 HDR compat/base.l1v1_c.part \
@@ -43,7 +46,7 @@ HDR compat/base.o_s.part     base.o_s.part \
 HDR base.o_c.part \
 HDR base.o_t.part
 
-EVDEV_PARTS_NO_COMPAT = base.hdr.part base.lists.part \
+evdev_parts = base.hdr.part base.lists.part \
 compat/base.lists.part \
 HDR evdev.m_k.part \
 HDR base.l1_k.part \
@@ -51,16 +54,16 @@ HDR base.l_k.part \
 HDR base.o_k.part \
 HDR base.ml_g.part \
 HDR base.m_g.part \
-HDR compat/base.mlv_s.part   extras/base.mlv_s.part   base.mlv_s.part \
-HDR compat/base.ml_s.part    extras/base.ml_s.part    base.ml_s.part  \
-HDR compat/base.ml1_s.part   extras/base.ml1_s.part   base.ml1_s.part \
-HDR compat/base.ml1v1_s.part extras/base.ml1v1_s.part \
-HDR compat/base.ml2_s.part    extras/base.ml2_s.part    base.ml2_s.part  \
-HDR compat/base.ml3_s.part    extras/base.ml3_s.part    base.ml3_s.part  \
-HDR compat/base.ml4_s.part    extras/base.ml4_s.part    base.ml4_s.part  \
-HDR compat/base.ml2v2_s.part  extras/base.ml2v2_s.part \
-HDR compat/base.ml3v3_s.part  extras/base.ml3v3_s.part \
-HDR compat/base.ml4v4_s.part  extras/base.ml4v4_s.part \
+HDR compat/base.mlv_s.part   base.mlv_s.part \
+HDR compat/base.ml_s.part    base.ml_s.part  \
+HDR compat/base.ml1_s.part   base.ml1_s.part \
+HDR compat/base.ml1v1_s.part \
+HDR compat/base.ml2_s.part    base.ml2_s.part  \
+HDR compat/base.ml3_s.part    base.ml3_s.part  \
+HDR compat/base.ml4_s.part    base.ml4_s.part  \
+HDR compat/base.ml2v2_s.part  \
+HDR compat/base.ml3v3_s.part  \
+HDR compat/base.ml4v4_s.part  \
 HDR evdev.m_s.part \
 HDR compat/base.lv_c.part   \
 HDR compat/base.l1v1_c.part \
@@ -79,23 +82,25 @@ HDR compat/base.o_s.part     base.o_s.part \
 HDR base.o_c.part \
 HDR base.o_t.part
 
-BASE_PARTS = base.hdr.part base.lists.part \
+else
+
+base_parts = base.hdr.part base.lists.part \
 HDR base.m_k.part \
 HDR base.l1_k.part \
 HDR base.l_k.part \
 HDR \
 HDR base.ml_g.part \
 HDR base.m_g.part \
-HDR extras/base.mlv_s.part   base.mlv_s.part \
-HDR extras/base.ml_s.part    base.ml_s.part  \
-HDR extras/base.ml1_s.part   base.ml1_s.part \
-HDR extras/base.ml1v1_s.part \
-HDR extras/base.ml2_s.part    base.ml2_s.part  \
-HDR extras/base.ml3_s.part    base.ml3_s.part  \
-HDR extras/base.ml4_s.part    base.ml4_s.part  \
-HDR extras/base.ml2v2_s.part \
-HDR extras/base.ml3v3_s.part \
-HDR extras/base.ml4v4_s.part \
+HDR base.mlv_s.part \
+HDR base.ml_s.part  \
+HDR base.ml1_s.part \
+HDR \
+HDR base.ml2_s.part  \
+HDR base.ml3_s.part  \
+HDR base.ml4_s.part  \
+HDR \
+HDR \
+HDR \
 HDR base.m_s.part \
 HDR \
 HDR \
@@ -114,23 +119,23 @@ HDR base.o_s.part \
 HDR base.o_c.part \
 HDR base.o_t.part
 
-EVDEV_PARTS = base.hdr.part base.lists.part \
+evdev_parts = base.hdr.part base.lists.part \
 HDR evdev.m_k.part \
 HDR base.l1_k.part \
 HDR base.l_k.part  \
 HDR \
 HDR base.ml_g.part \
 HDR base.m_g.part \
-HDR extras/base.mlv_s.part   base.mlv_s.part \
-HDR extras/base.ml_s.part    base.ml_s.part  \
-HDR extras/base.ml1_s.part   base.ml1_s.part \
-HDR extras/base.ml1v1_s.part \
-HDR extras/base.ml2_s.part    base.ml2_s.part  \
-HDR extras/base.ml3_s.part    base.ml3_s.part  \
-HDR extras/base.ml4_s.part    base.ml4_s.part  \
-HDR extras/base.ml2v2_s.part \
-HDR extras/base.ml3v3_s.part \
-HDR extras/base.ml4v4_s.part \
+HDR base.mlv_s.part \
+HDR base.ml_s.part  \
+HDR base.ml1_s.part \
+HDR \
+HDR base.ml2_s.part  \
+HDR base.ml3_s.part  \
+HDR base.ml4_s.part  \
+HDR \
+HDR \
+HDR \
 HDR evdev.m_s.part \
 HDR \
 HDR \
@@ -149,21 +154,23 @@ HDR base.o_s.part \
 HDR base.o_c.part \
 HDR base.o_t.part
 
-RULES_FILES = base evdev xfree98
+endif
+rules_files = base evdev xfree98
 
-LST_FILES = base.lst evdev.lst
+lst_files = base.lst evdev.lst
 
 $(DESTDIR)\%.lst: $(DESTDIR)\%.xml
 	perl xml2lst.pl < $< > $@
 
-$(DESTDIR)\base: compat\all $(BASE_PARTS_NO_COMPAT)
-	merge $@ $(BASE_PARTS)
+$(DESTDIR)\base: compat\all $(base_parts)
+	merge $@ $(base_parts)
+
+$(DESTDIR)\evdev: compat\all $(evdev_parts)
+	merge $@ $(evdev_parts) 
 
-$(DESTDIR)\evdev: compat\all $(EVDEV_PARTS_NO_COMPAT)
-	merge $@ $(EVDEV_PARTS) 
+dist_files = xkb.dtd README
 
-ALL_RULES_FILES = $(RULES_FILES) $(LST_FILES) \
-xkb.dtd README
+rules_DATA = $(rules_files) $(lst_files) $(dist_files)
 
 COMPATFILES=xorg xorg.xml xorg.lst
 $(DESTDIR)\xorg: $(DESTDIR)\base
@@ -171,9 +178,10 @@ $(DESTDIR)\xorg: $(DESTDIR)\base
 $(DESTDIR)\xorg%: $(DESTDIR)\base%
 	copy $< $@
 
-rules_DATA = $(ALL_RULES_FILES) $(COMPATFILES)
+rules_DATA := $(rules_DATA) $(COMPATFILES)
 
-xml_DATA = base.xml evdev.xml base.extras.xml evdev.extras.xml 
+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) 
 
 $(DESTDIR)\%.xml: %.xml.in
 	copy $< $@