diff options
Diffstat (limited to 'xorg-server/xkbdata.src/rules/Makefile.am')
| -rw-r--r-- | xorg-server/xkbdata.src/rules/Makefile.am | 165 |
1 files changed, 101 insertions, 64 deletions
diff --git a/xorg-server/xkbdata.src/rules/Makefile.am b/xorg-server/xkbdata.src/rules/Makefile.am index 5d6e8b4bf..18b8b1a0e 100644 --- a/xorg-server/xkbdata.src/rules/Makefile.am +++ b/xorg-server/xkbdata.src/rules/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = compat +SUBDIRS = bin compat extras if CREATE_RULES_SYMLINK # extra_rules_file = $(xkb_rules_symlink) @@ -20,126 +20,162 @@ install-data-hook: endif -base_parts_no_compat = base.hdr.part base.lists.part \ +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 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 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.l2_s.part extras/base.l2_s.part base.l2_s.part \ +HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \ +HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \ +HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \ +HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \ +HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \ HDR base.m_s.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 base.o_s.part \ +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 \ -HDR base.l_k.part \ +HDR base.l_k.part \ +HDR base.o_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 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.l2_s.part extras/base.l2_s.part base.l2_s.part \ +HDR compat/base.l3_s.part extras/base.l3_s.part base.l3_s.part \ +HDR compat/base.l4_s.part extras/base.l4_s.part base.l4_s.part \ +HDR compat/base.l2v2_s.part extras/base.l2v2_s.part \ +HDR compat/base.l3v3_s.part extras/base.l3v3_s.part \ +HDR compat/base.l4v4_s.part extras/base.l4v4_s.part \ HDR evdev.m_s.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 base.o_s.part \ +HDR compat/base.o_s.part base.o_s.part \ HDR base.o_c.part \ HDR base.o_t.part -if USE_COMPAT_RULES +else + 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 \ 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.l2_s.part base.l2_s.part \ -HDR compat/base.l3_s.part base.l3_s.part \ -HDR compat/base.l4_s.part base.l4_s.part \ -HDR compat/base.l2v2_s.part \ -HDR compat/base.l3v3_s.part \ -HDR compat/base.l4v4_s.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.l2_s.part base.l2_s.part \ +HDR extras/base.l3_s.part base.l3_s.part \ +HDR extras/base.l4_s.part base.l4_s.part \ +HDR extras/base.l2v2_s.part \ +HDR extras/base.l3v3_s.part \ +HDR extras/base.l4v4_s.part \ HDR base.m_s.part \ HDR base.ml_c.part \ HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.lo_s.part \ +HDR \ 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_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.l_k.part \ +HDR \ 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.l2_s.part base.l2_s.part \ -HDR compat/base.l3_s.part base.l3_s.part \ -HDR compat/base.l4_s.part base.l4_s.part \ -HDR compat/base.l2v2_s.part \ -HDR compat/base.l3v3_s.part \ -HDR compat/base.l4v4_s.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.l2_s.part base.l2_s.part \ +HDR extras/base.l3_s.part base.l3_s.part \ +HDR extras/base.l4_s.part base.l4_s.part \ +HDR extras/base.l2v2_s.part \ +HDR extras/base.l3v3_s.part \ +HDR extras/base.l4v4_s.part \ HDR evdev.m_s.part \ HDR base.ml_c.part \ HDR base.ml1_c.part \ HDR base.m_t.part \ -HDR base.lo_s.part \ +HDR \ 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_s.part \ HDR base.o_c.part \ HDR base.o_t.part -else -base_parts = $(base_parts_no_compat) -evdev_parts = $(base_parts_no_compat) + endif -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 @@ -148,30 +184,31 @@ lst_files = base.lst evdev.lst %.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) 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) $(srcdir)/evdev.xml.in: base.xml.in cp $< $@ +$(srcdir)/evdev.extras.xml.in: base.extras.xml.in + cp $< $@ + 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) |