1 files changed, 30 insertions, 114 deletions
diff --git a/xorg-server/xkbdata.src/symbols/makefile b/xorg-server/xkbdata.src/symbols/makefile
index 82bdbea58..d6762e1ae 100644
--- a/xorg-server/xkbdata.src/symbols/makefile
+++ b/xorg-server/xkbdata.src/symbols/makefile
@@ -8,122 +8,38 @@ DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
 $(DESTDIR):
 	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
 
-SUBDIRS = pc macintosh sun fujitsu nec digital hp sgi sony xfree68
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr
 
 dist_xkbdata_symbols_DATA = \
-	al \
-	altwin \
-	am \
-	apple \
-	ar \
-	az \
-	be \
-	ben \
-	bg \
-	br \
-	bs \
-	by \
-	ca \
-	ca_enhanced \
-	capslock \
-	compose \
-	ctrl \
-	cz \
-	cz_qwerty \
-	czsk \
-	de \
-	de_CH \
-	dev \
-	dk \
-	dvorak \
-	ee \
-	el \
-	en_US \
-	es \
-	eurosign \
-	fi \
-	fo \
-	fr \
-	fr_CH \
-	gb \
-	ge_la \
-	ge_ru \
-	group \
-	guj \
-	gur \
-	hr \
-	hr_US \
-	hu \
-	hu_qwerty \
-	hu_US \
-	ie \
-	il \
-	il_phonetic \
-	inet \
-	ir \
-	is \
-	iso9995-3 \
-	it \
-	iu \
-	jp \
-	kan \
-	keypad \
-	la \
-	level3 \
-	lo \
-	lock \
-	lt \
-	lt_a \
-	lt_p \
-	lt_std \
-	lv \
-	mk \
-	ml \
-	mm \
-	mn \
-	mt \
-	mt_us \
-	nl \
-	no \
-	ogham \
-	ori \
-	pc104 \
-	pl \
-	pl2 \
-	pt \
-	ralt \
-	README \
-	ro \
-	ro2 \
-	ru \
-	sapmi \
-	se \
-	se_FI \
-	se_NO \
-	se_SE \
-	si \
-	sk \
-	sk_qwerty \
-	sr \
-	srvr_ctrl \
-	syr \
-	syr_phonetic \
-	tel \
-	th \
-	th_pat \
-	th_tis \
-	tj \
-	tml \
-	tr \
-	tr_f \
-	ua \
-	us \
-	us_group2 \
-	us_group3 \
-	us_intl \
-	uz \
-	vn \
-	yu
+ad af al \
+am ara az \
+be bd \
+bg br ba \
+bt by braille \
+ca cd \
+ch cn cz \
+de dk \
+ee es et epo \
+fi fo fr \
+gb ge gh gn \
+gr hr hu \
+ie il in iq \
+ir is it jp \
+kg kh kr kz \
+la latam latin \
+lk lt lv \
+ma mao me mk \
+mm mn mt mv \
+ng nl no np \
+pc pk pl pt \
+ro rs ru \
+se si sk \
+sy th \
+tj tr \
+ua us uz vn \
+za \
+altwin capslock compose ctrl eurosign group inet \
+keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl
 
 DATA_FILES=$(dist_xkbdata_symbols_DATA:%=$(DESTDIR)\%)