From dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 12 Sep 2011 11:27:51 +0200 Subject: Synchronised line endinge with release branch --- .../xkeyboard-config/rules/compat/Makefile.am | 134 ++++++++++----------- .../rules/compat/variantsMapping.lst | 98 +++++++-------- 2 files changed, 116 insertions(+), 116 deletions(-) (limited to 'xorg-server/xkeyboard-config/rules/compat') diff --git a/xorg-server/xkeyboard-config/rules/compat/Makefile.am b/xorg-server/xkeyboard-config/rules/compat/Makefile.am index 37570e0da..814bd25cf 100644 --- a/xorg-server/xkeyboard-config/rules/compat/Makefile.am +++ b/xorg-server/xkeyboard-config/rules/compat/Makefile.am @@ -1,67 +1,67 @@ - -transform_files=layoutsMapping.lst variantsMapping.lst - -dist_parts=base.o_s.part \ -base.lv_c.part \ -base.l1v1_c.part \ -base.l2v2_c.part \ -base.l3v3_c.part \ -base.l4v4_c.part - -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 - -if USE_COMPAT_RULES - -noinst_SCRIPTS=$(scripts) $(dist_parts) - -else - -noinst_SCRIPTS= - -endif - -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=base.lists.part $(transform_files) $(dist_parts) - -CLEANFILES=$(scripts) + +transform_files=layoutsMapping.lst variantsMapping.lst + +dist_parts=base.o_s.part \ +base.lv_c.part \ +base.l1v1_c.part \ +base.l2v2_c.part \ +base.l3v3_c.part \ +base.l4v4_c.part + +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 + +if USE_COMPAT_RULES + +noinst_SCRIPTS=$(scripts) $(dist_parts) + +else + +noinst_SCRIPTS= + +endif + +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=base.lists.part $(transform_files) $(dist_parts) + +CLEANFILES=$(scripts) diff --git a/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst b/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst index 1b9d1d182..80745519d 100644 --- a/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst +++ b/xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst @@ -1,49 +1,49 @@ -ben basic in ben -ben probhat in ben_probhat -dev basic in deva -dvorak $dvoraklayouts %v dvorak -dvorak basic us dvorak -dvorak pl_basic pl dvorak -dvorak pl pl dvorak_quotes -dvorak pl_altquotes pl dvorak_altquotes -dzdwi basic bt basic -fi basic fi classic -ge azerty_tskapo fr geo -guj basic in guj -gur basic in guru -ie laptop ie basic -ie CloGaelachLaptop ie CloGaelach -in urd in urd-phonetic -iu basic ca ike -lo basic la basic -kan basic in kan -mal basic in mal -mal mlplusnum in mal -ogham basic ie ogam -ogham laptop ie ogam -ogham is434 ie ogam_is434 -ogham is434laptop ie ogam_is434 -ori basic in ori -ro de ro winkeys -ro us ro std -ro academic ro std -ro std_comma ro std -ro comma ro basic -ru os ru os_legacy -pk urd pk urd-phonetic -sapmi basic no smi -sapmi nodeadkeys no smi_nodeadkeys -sapmi sefi fi smi -sin phonetic-static in sin_phonetic -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 -yu basic srp latin -yu unicode srp latinunicode -yu yz srp latinyz -yu unicodeyz srp latinunicodeyz +ben basic in ben +ben probhat in ben_probhat +dev basic in deva +dvorak $dvoraklayouts %v dvorak +dvorak basic us dvorak +dvorak pl_basic pl dvorak +dvorak pl pl dvorak_quotes +dvorak pl_altquotes pl dvorak_altquotes +dzdwi basic bt basic +fi basic fi classic +ge azerty_tskapo fr geo +guj basic in guj +gur basic in guru +ie laptop ie basic +ie CloGaelachLaptop ie CloGaelach +in urd in urd-phonetic +iu basic ca ike +lo basic la basic +kan basic in kan +mal basic in mal +mal mlplusnum in mal +ogham basic ie ogam +ogham laptop ie ogam +ogham is434 ie ogam_is434 +ogham is434laptop ie ogam_is434 +ori basic in ori +ro de ro winkeys +ro us ro std +ro academic ro std +ro std_comma ro std +ro comma ro basic +ru os ru os_legacy +pk urd pk urd-phonetic +sapmi basic no smi +sapmi nodeadkeys no smi_nodeadkeys +sapmi sefi fi smi +sin phonetic-static in sin_phonetic +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 +yu basic srp latin +yu unicode srp latinunicode +yu yz srp latinyz +yu unicodeyz srp latinunicodeyz -- cgit v1.2.3