diff options
author | Peter Hutterer <peter.hutterer@who-t.net> | 2020-05-27 14:06:29 +1000 |
---|---|---|
committer | Sergey Udaltsov <sergey.udaltsov@gmail.com> | 2020-06-02 20:04:48 +0000 |
commit | 3455f4f290bc6ebd1fc36f41572f5943879c1ba7 (patch) | |
tree | 771f2675ad60e1568a02fa4d117d0a6b10c04539 | |
parent | eb2c97e4c518f1971d364b48ba12dc664960454e (diff) |
rules: remove the useless 'base' prefix from the parts files
We only have two rulesets that matter - base and evdev. Let's drop the "base"
prefix from the files that are used by both and leave it only where it is
ruleset-specific.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-rw-r--r-- | rules/0000-hdr.part (renamed from rules/0000-base.hdr.part) | 0 | ||||
-rw-r--r-- | rules/0001-lists.part (renamed from rules/0001-base.lists.part) | 0 | ||||
-rw-r--r-- | rules/0002-base.lists.part (renamed from rules/0002-base.lists.base.part) | 0 | ||||
-rw-r--r-- | rules/0002-evdev.lists.part (renamed from rules/0002-evdev.lists.base.part) | 0 | ||||
-rw-r--r-- | rules/0005-l1_k.part (renamed from rules/0005-base.l1_k.part) | 0 | ||||
-rw-r--r-- | rules/0006-l_k.part (renamed from rules/0006-base.l_k.part) | 0 | ||||
-rw-r--r-- | rules/0007-o_k.part (renamed from rules/0007-base.o_k.part) | 0 | ||||
-rw-r--r-- | rules/0008-ml_g.part (renamed from rules/0008-base.ml_g.part) | 0 | ||||
-rw-r--r-- | rules/0009-m_g.part (renamed from rules/0009-base.m_g.part) | 0 | ||||
-rw-r--r-- | rules/0011-mlv_s.part (renamed from rules/0011-base.mlv_s.part) | 0 | ||||
-rw-r--r-- | rules/0013-ml_s.part (renamed from rules/0013-base.ml_s.part) | 0 | ||||
-rw-r--r-- | rules/0015-ml1_s.part (renamed from rules/0015-base.ml1_s.part) | 0 | ||||
-rw-r--r-- | rules/0018-ml2_s.part (renamed from rules/0018-base.ml2_s.part) | 0 | ||||
-rw-r--r-- | rules/0020-ml3_s.part (renamed from rules/0020-base.ml3_s.part) | 0 | ||||
-rw-r--r-- | rules/0022-ml4_s.part (renamed from rules/0022-base.ml4_s.part) | 0 | ||||
-rw-r--r-- | rules/0033-ml_c.part (renamed from rules/0033-base.ml_c.part) | 0 | ||||
-rw-r--r-- | rules/0034-ml1_c.part (renamed from rules/0034-base.ml1_c.part) | 0 | ||||
-rw-r--r-- | rules/0035-m_t.part (renamed from rules/0035-base.m_t.part) | 0 | ||||
-rw-r--r-- | rules/0036-lo_s.part (renamed from rules/0036-base.lo_s.part) | 0 | ||||
-rw-r--r-- | rules/0037-l1o_s.part (renamed from rules/0037-base.l1o_s.part) | 0 | ||||
-rw-r--r-- | rules/0038-l2o_s.part (renamed from rules/0038-base.l2o_s.part) | 0 | ||||
-rw-r--r-- | rules/0039-l3o_s.part (renamed from rules/0039-base.l3o_s.part) | 0 | ||||
-rw-r--r-- | rules/0040-l4o_s.part (renamed from rules/0040-base.l4o_s.part) | 0 | ||||
-rw-r--r-- | rules/0042-o_s.part (renamed from rules/0042-base.o_s.part) | 0 | ||||
-rw-r--r-- | rules/0043-o_c.part (renamed from rules/0043-base.o_c.part) | 0 | ||||
-rw-r--r-- | rules/0044-o_t.part (renamed from rules/0044-base.o_t.part) | 0 | ||||
-rw-r--r-- | rules/Makefile.am | 84 | ||||
-rw-r--r-- | rules/compat/0003-lists.part (renamed from rules/compat/0003-base.lists.part) | 0 | ||||
-rw-r--r-- | rules/compat/0028-lv_c.part (renamed from rules/compat/0028-base.lv_c.part) | 0 | ||||
-rw-r--r-- | rules/compat/0029-l1v1_c.part (renamed from rules/compat/0029-base.l1v1_c.part) | 0 | ||||
-rw-r--r-- | rules/compat/0030-l2v2_c.part (renamed from rules/compat/0030-base.l2v2_c.part) | 0 | ||||
-rw-r--r-- | rules/compat/0031-l3v3_c.part (renamed from rules/compat/0031-base.l3v3_c.part) | 0 | ||||
-rw-r--r-- | rules/compat/0032-l4v4_c.part (renamed from rules/compat/0032-base.l4v4_c.part) | 0 | ||||
-rw-r--r-- | rules/compat/0041-o_s.part (renamed from rules/compat/0041-base.o_s.part) | 0 | ||||
-rw-r--r-- | rules/compat/Makefile.am | 54 |
35 files changed, 69 insertions, 69 deletions
diff --git a/rules/0000-base.hdr.part b/rules/0000-hdr.part index 8c90c2f2..8c90c2f2 100644 --- a/rules/0000-base.hdr.part +++ b/rules/0000-hdr.part diff --git a/rules/0001-base.lists.part b/rules/0001-lists.part index 070f47c3..070f47c3 100644 --- a/rules/0001-base.lists.part +++ b/rules/0001-lists.part diff --git a/rules/0002-base.lists.base.part b/rules/0002-base.lists.part index 75059447..75059447 100644 --- a/rules/0002-base.lists.base.part +++ b/rules/0002-base.lists.part diff --git a/rules/0002-evdev.lists.base.part b/rules/0002-evdev.lists.part index 7b5d0d46..7b5d0d46 100644 --- a/rules/0002-evdev.lists.base.part +++ b/rules/0002-evdev.lists.part diff --git a/rules/0005-base.l1_k.part b/rules/0005-l1_k.part index 3f2146af..3f2146af 100644 --- a/rules/0005-base.l1_k.part +++ b/rules/0005-l1_k.part diff --git a/rules/0006-base.l_k.part b/rules/0006-l_k.part index a0955177..a0955177 100644 --- a/rules/0006-base.l_k.part +++ b/rules/0006-l_k.part diff --git a/rules/0007-base.o_k.part b/rules/0007-o_k.part index 0c42cd84..0c42cd84 100644 --- a/rules/0007-base.o_k.part +++ b/rules/0007-o_k.part diff --git a/rules/0008-base.ml_g.part b/rules/0008-ml_g.part index 66cac540..66cac540 100644 --- a/rules/0008-base.ml_g.part +++ b/rules/0008-ml_g.part diff --git a/rules/0009-base.m_g.part b/rules/0009-m_g.part index 807838f1..807838f1 100644 --- a/rules/0009-base.m_g.part +++ b/rules/0009-m_g.part diff --git a/rules/0011-base.mlv_s.part b/rules/0011-mlv_s.part index b2e50233..b2e50233 100644 --- a/rules/0011-base.mlv_s.part +++ b/rules/0011-mlv_s.part diff --git a/rules/0013-base.ml_s.part b/rules/0013-ml_s.part index 7708f4c3..7708f4c3 100644 --- a/rules/0013-base.ml_s.part +++ b/rules/0013-ml_s.part diff --git a/rules/0015-base.ml1_s.part b/rules/0015-ml1_s.part index 667eb19f..667eb19f 100644 --- a/rules/0015-base.ml1_s.part +++ b/rules/0015-ml1_s.part diff --git a/rules/0018-base.ml2_s.part b/rules/0018-ml2_s.part index 0aaa8d63..0aaa8d63 100644 --- a/rules/0018-base.ml2_s.part +++ b/rules/0018-ml2_s.part diff --git a/rules/0020-base.ml3_s.part b/rules/0020-ml3_s.part index ccd8f920..ccd8f920 100644 --- a/rules/0020-base.ml3_s.part +++ b/rules/0020-ml3_s.part diff --git a/rules/0022-base.ml4_s.part b/rules/0022-ml4_s.part index 34693c56..34693c56 100644 --- a/rules/0022-base.ml4_s.part +++ b/rules/0022-ml4_s.part diff --git a/rules/0033-base.ml_c.part b/rules/0033-ml_c.part index 91fb1896..91fb1896 100644 --- a/rules/0033-base.ml_c.part +++ b/rules/0033-ml_c.part diff --git a/rules/0034-base.ml1_c.part b/rules/0034-ml1_c.part index 874e4e34..874e4e34 100644 --- a/rules/0034-base.ml1_c.part +++ b/rules/0034-ml1_c.part diff --git a/rules/0035-base.m_t.part b/rules/0035-m_t.part index 2a1de2da..2a1de2da 100644 --- a/rules/0035-base.m_t.part +++ b/rules/0035-m_t.part diff --git a/rules/0036-base.lo_s.part b/rules/0036-lo_s.part index c26dbc0d..c26dbc0d 100644 --- a/rules/0036-base.lo_s.part +++ b/rules/0036-lo_s.part diff --git a/rules/0037-base.l1o_s.part b/rules/0037-l1o_s.part index 202fd6e2..202fd6e2 100644 --- a/rules/0037-base.l1o_s.part +++ b/rules/0037-l1o_s.part diff --git a/rules/0038-base.l2o_s.part b/rules/0038-l2o_s.part index 17df2818..17df2818 100644 --- a/rules/0038-base.l2o_s.part +++ b/rules/0038-l2o_s.part diff --git a/rules/0039-base.l3o_s.part b/rules/0039-l3o_s.part index 81c35354..81c35354 100644 --- a/rules/0039-base.l3o_s.part +++ b/rules/0039-l3o_s.part diff --git a/rules/0040-base.l4o_s.part b/rules/0040-l4o_s.part index 9e64b4a5..9e64b4a5 100644 --- a/rules/0040-base.l4o_s.part +++ b/rules/0040-l4o_s.part diff --git a/rules/0042-base.o_s.part b/rules/0042-o_s.part index e7fc1d22..e7fc1d22 100644 --- a/rules/0042-base.o_s.part +++ b/rules/0042-o_s.part diff --git a/rules/0043-base.o_c.part b/rules/0043-o_c.part index d3e8a466..d3e8a466 100644 --- a/rules/0043-base.o_c.part +++ b/rules/0043-o_c.part diff --git a/rules/0044-base.o_t.part b/rules/0044-o_t.part index a43a993f..a43a993f 100644 --- a/rules/0044-base.o_t.part +++ b/rules/0044-o_t.part diff --git a/rules/Makefile.am b/rules/Makefile.am index e9ab0579..d584638a 100644 --- a/rules/Makefile.am +++ b/rules/Makefile.am @@ -21,53 +21,53 @@ install-data-hook: endif parts = \ - 0000-base.hdr.part \ - 0001-base.lists.part \ - 0002-RULESET.lists.base.part \ + 0000-hdr.part \ + 0001-lists.part \ + 0002-RULESET.lists.part \ 0004-RULESET.m_k.part \ - 0005-base.l1_k.part \ - 0006-base.l_k.part \ - 0007-base.o_k.part \ - 0008-base.ml_g.part \ - 0009-base.m_g.part \ - 0011-base.mlv_s.part \ - 0013-base.ml_s.part \ - 0015-base.ml1_s.part \ - 0018-base.ml2_s.part \ - 0020-base.ml3_s.part \ - 0022-base.ml4_s.part \ + 0005-l1_k.part \ + 0006-l_k.part \ + 0007-o_k.part \ + 0008-ml_g.part \ + 0009-m_g.part \ + 0011-mlv_s.part \ + 0013-ml_s.part \ + 0015-ml1_s.part \ + 0018-ml2_s.part \ + 0020-ml3_s.part \ + 0022-ml4_s.part \ 0026-RULESET.m_s.part \ 0027-RULESET.ml_s1.part \ - 0033-base.ml_c.part \ - 0034-base.ml1_c.part \ - 0035-base.m_t.part \ - 0036-base.lo_s.part \ - 0037-base.l1o_s.part \ - 0038-base.l2o_s.part \ - 0039-base.l3o_s.part \ - 0040-base.l4o_s.part \ - 0042-base.o_s.part \ - 0043-base.o_c.part \ - 0044-base.o_t.part + 0033-ml_c.part \ + 0034-ml1_c.part \ + 0035-m_t.part \ + 0036-lo_s.part \ + 0037-l1o_s.part \ + 0038-l2o_s.part \ + 0039-l3o_s.part \ + 0040-l4o_s.part \ + 0042-o_s.part \ + 0043-o_c.part \ + 0044-o_t.part compat_parts = \ - compat/0003-base.lists.part \ - compat/0010-base.mlv_s.part \ - compat/0012-base.ml_s.part \ - compat/0014-base.ml1_s.part \ - compat/0016-base.ml1v1_s.part \ - compat/0017-base.ml2_s.part \ - compat/0019-base.ml3_s.part \ - compat/0021-base.ml4_s.part \ - compat/0023-base.ml2v2_s.part \ - compat/0024-base.ml3v3_s.part \ - compat/0025-base.ml4v4_s.part \ - compat/0028-base.lv_c.part \ - compat/0029-base.l1v1_c.part \ - compat/0030-base.l2v2_c.part \ - compat/0031-base.l3v3_c.part \ - compat/0032-base.l4v4_c.part \ - compat/0041-base.o_s.part + compat/0003-lists.part \ + compat/0010-mlv_s.part \ + compat/0012-ml_s.part \ + compat/0014-ml1_s.part \ + compat/0016-ml1v1_s.part \ + compat/0017-ml2_s.part \ + compat/0019-ml3_s.part \ + compat/0021-ml4_s.part \ + compat/0023-ml2v2_s.part \ + compat/0024-ml3v3_s.part \ + compat/0025-ml4v4_s.part \ + compat/0028-lv_c.part \ + compat/0029-l1v1_c.part \ + compat/0030-l2v2_c.part \ + compat/0031-l3v3_c.part \ + compat/0032-l4v4_c.part \ + compat/0041-o_s.part if USE_COMPAT_RULES parts += $(compat_parts) diff --git a/rules/compat/0003-base.lists.part b/rules/compat/0003-lists.part index 2178e395..2178e395 100644 --- a/rules/compat/0003-base.lists.part +++ b/rules/compat/0003-lists.part diff --git a/rules/compat/0028-base.lv_c.part b/rules/compat/0028-lv_c.part index ea58f61d..ea58f61d 100644 --- a/rules/compat/0028-base.lv_c.part +++ b/rules/compat/0028-lv_c.part diff --git a/rules/compat/0029-base.l1v1_c.part b/rules/compat/0029-l1v1_c.part index f5ff3a21..f5ff3a21 100644 --- a/rules/compat/0029-base.l1v1_c.part +++ b/rules/compat/0029-l1v1_c.part diff --git a/rules/compat/0030-base.l2v2_c.part b/rules/compat/0030-l2v2_c.part index cf6e0f2f..cf6e0f2f 100644 --- a/rules/compat/0030-base.l2v2_c.part +++ b/rules/compat/0030-l2v2_c.part diff --git a/rules/compat/0031-base.l3v3_c.part b/rules/compat/0031-l3v3_c.part index a015adc9..a015adc9 100644 --- a/rules/compat/0031-base.l3v3_c.part +++ b/rules/compat/0031-l3v3_c.part diff --git a/rules/compat/0032-base.l4v4_c.part b/rules/compat/0032-l4v4_c.part index 6b7be5f5..6b7be5f5 100644 --- a/rules/compat/0032-base.l4v4_c.part +++ b/rules/compat/0032-l4v4_c.part diff --git a/rules/compat/0041-base.o_s.part b/rules/compat/0041-o_s.part index 2f16e6a5..2f16e6a5 100644 --- a/rules/compat/0041-base.o_s.part +++ b/rules/compat/0041-o_s.part diff --git a/rules/compat/Makefile.am b/rules/compat/Makefile.am index e74aebb2..0aa46693 100644 --- a/rules/compat/Makefile.am +++ b/rules/compat/Makefile.am @@ -2,24 +2,24 @@ layout_mappings=$(srcdir)/layoutsMapping.lst variant_mappings=$(srcdir)/variantsMapping.lst dist_parts= \ - 0041-base.o_s.part \ - 0028-base.lv_c.part \ - 0029-base.l1v1_c.part \ - 0030-base.l2v2_c.part \ - 0031-base.l3v3_c.part \ - 0032-base.l4v4_c.part + 0041-o_s.part \ + 0028-lv_c.part \ + 0029-l1v1_c.part \ + 0030-l2v2_c.part \ + 0031-l3v3_c.part \ + 0032-l4v4_c.part scripts= \ - 0017-base.ml2_s.part \ - 0019-base.ml3_s.part \ - 0021-base.ml4_s.part \ - 0023-base.ml2v2_s.part \ - 0024-base.ml3v3_s.part \ - 0025-base.ml4v4_s.part \ - 0012-base.ml_s.part \ - 0014-base.ml1_s.part \ - 0010-base.mlv_s.part \ - 0016-base.ml1v1_s.part + 0017-ml2_s.part \ + 0019-ml3_s.part \ + 0021-ml4_s.part \ + 0023-ml2v2_s.part \ + 0024-ml3v3_s.part \ + 0025-ml4v4_s.part \ + 0012-ml_s.part \ + 0014-ml1_s.part \ + 0010-mlv_s.part \ + 0016-ml1v1_s.part if USE_COMPAT_RULES @@ -31,36 +31,36 @@ noinst_SCRIPTS= endif -0014-base.ml1_s.part: map-variants.py $(layout_mappings) $(variant_mappings) +0014-ml1_s.part: map-variants.py $(layout_mappings) $(variant_mappings) $(srcdir)/map-variants.py --want=mls --number=1 $@ $(layout_mappings) $(variant_mappings) -0017-base.ml2_s.part: map-variants.py $(layout_mappings) $(variant_mappings) +0017-ml2_s.part: map-variants.py $(layout_mappings) $(variant_mappings) $(srcdir)/map-variants.py --want=mls --number=2 $@ $(layout_mappings) $(variant_mappings) -0019-base.ml3_s.part: map-variants.py $(layout_mappings) $(variant_mappings) +0019-ml3_s.part: map-variants.py $(layout_mappings) $(variant_mappings) $(srcdir)/map-variants.py --want=mls --number=3 $@ $(layout_mappings) $(variant_mappings) -0021-base.ml4_s.part: map-variants.py $(layout_mappings) $(variant_mappings) +0021-ml4_s.part: map-variants.py $(layout_mappings) $(variant_mappings) $(srcdir)/map-variants.py --want=mls --number=4 $@ $(layout_mappings) $(variant_mappings) -0016-base.ml1v1_s.part: map-variants.py $(variant_mappings) +0016-ml1v1_s.part: map-variants.py $(variant_mappings) $(srcdir)/map-variants.py --want=mlvs --number=1 $@ $(variant_mappings) -0023-base.ml2v2_s.part: map-variants.py $(variant_mappings) +0023-ml2v2_s.part: map-variants.py $(variant_mappings) $(srcdir)/map-variants.py --want=mlvs --number=2 $@ $(variant_mappings) -0024-base.ml3v3_s.part: map-variants.py $(variant_mappings) +0024-ml3v3_s.part: map-variants.py $(variant_mappings) $(srcdir)/map-variants.py --want=mlvs --number=3 $@ $(variant_mappings) -0025-base.ml4v4_s.part: map-variants.py $(variant_mappings) +0025-ml4v4_s.part: map-variants.py $(variant_mappings) $(srcdir)/map-variants.py --want=mlvs --number=4 $@ $(variant_mappings) -0012-base.ml_s.part: map-variants.py $(layout_mappings) $(variant_mappings) +0012-ml_s.part: map-variants.py $(layout_mappings) $(variant_mappings) $(srcdir)/map-variants.py --want=mls $@ $(layout_mappings) $(variant_mappings) -0010-base.mlv_s.part: map-variants.py $(layout_mappings) $(variant_mappings) +0010-mlv_s.part: map-variants.py $(layout_mappings) $(variant_mappings) $(srcdir)/map-variants.py --want=mlvs $@ $(variant_mappings) -EXTRA_DIST=0003-base.lists.part $(layout_mappings) $(variant_mappings) $(dist_parts) map-variants.py +EXTRA_DIST=0003-lists.part $(layout_mappings) $(variant_mappings) $(dist_parts) map-variants.py CLEANFILES=$(scripts) |