diff options
Diffstat (limited to 'xorg-server/xkeyboard-config/rules/makefile')
-rw-r--r-- | xorg-server/xkeyboard-config/rules/makefile | 118 |
1 files changed, 63 insertions, 55 deletions
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 $< $@ |