Changes for VC compilation

10 files changed, 370 insertions, 0 deletions

diff --git a/xorg-server/xkbdata.src/compat/makefile b/xorg-server/xkbdata.src/compat/makefile
new file mode 100644
index 000000000..0598a1fd9
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/makefile
@@ -0,0 +1,33 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+THISDIR=compat
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
+$(DESTDIR):
+	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+dist_xkbdata_compat_DATA = \
+	accessx \
+	basic \
+	complete \
+	default \
+	iso9995 \
+	japan \
+	keypad \
+	ledcaps \
+	lednum \
+	ledscroll \
+	misc \
+	mousekeys \
+	norepeat \
+	pc \
+	pc98 \
+	README \
+	xfree86 \
+	xtest
+
+DATA_FILES=$(dist_xkbdata_compat_DATA:%=$(DESTDIR)\%)
+
+include ..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/geometry/makefile b/xorg-server/xkbdata.src/geometry/makefile
new file mode 100644
index 000000000..0c8e83bfb
--- /dev/null
+++ b/xorg-server/xkbdata.src/geometry/makefile
@@ -0,0 +1,41 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+THISDIR=geometry
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
+$(DESTDIR):
+	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+dist_xkbdata_geometry_DATA = \
+	amiga \
+	ataritt \
+	chicony \
+	dell \
+	everex \
+	fujitsu \
+	hp \
+	keytronic \
+	kinesis \
+	macintosh \
+	microsoft \
+	nec \
+	northgate \
+	pc \
+	README \
+	sony \
+	sun \
+	winbook
+
+DATA_FILES=$(dist_xkbdata_geometry_DATA:%=$(DESTDIR)\%)
+
+SUBDIRS = digital ibm sgi
+
+load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
+
+.PHONY: extrastuff
+
+extrastuff: $(SUBDIRS:%=%\all)
+
+include ..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/keycodes/makefile b/xorg-server/xkbdata.src/keycodes/makefile
new file mode 100644
index 000000000..880881042
--- /dev/null
+++ b/xorg-server/xkbdata.src/keycodes/makefile
@@ -0,0 +1,36 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+THISDIR=keycodes
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
+$(DESTDIR):
+	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+SUBDIRS = digital sgi
+
+dist_xkbdata_keycodes_DATA = \
+	aliases \
+	amiga \
+	ataritt \
+	fujitsu \
+	hp \
+	ibm \
+	macintosh \
+	powerpcps2 \
+	README \
+	sony \
+	sun \
+	xfree86 \
+	xfree98
+
+DATA_FILES=$(dist_xkbdata_keycodes_DATA:%=$(DESTDIR)\%)
+
+load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
+
+.PHONY: extrastuff
+
+extrastuff: $(SUBDIRS:%=%\all)
+
+include ..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/keymap/makefile b/xorg-server/xkbdata.src/keymap/makefile
new file mode 100644
index 000000000..0cb723e11
--- /dev/null
+++ b/xorg-server/xkbdata.src/keymap/makefile
@@ -0,0 +1,30 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+THISDIR=keymap
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
+$(DESTDIR):
+	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+SUBDIRS = sun digital sgi
+
+dist_xkbdata_keymap_DATA = \
+	amiga \
+	ataritt \
+	macintosh \
+	README \
+	sony \
+	xfree86 \
+	xfree98
+
+DATA_FILES=$(dist_xkbdata_keymap_DATA:%=$(DESTDIR)\%)
+
+load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
+
+.PHONY: extrastuff
+
+extrastuff: $(SUBDIRS:%=%\all)
+
+include ..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/makefile b/xorg-server/xkbdata.src/makefile
new file mode 100644
index 000000000..1e3855fa4
--- /dev/null
+++ b/xorg-server/xkbdata.src/makefile
@@ -0,0 +1,9 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+SUBDIRS = semantics keycodes keymap compat geometry torture symbols rules types
+
+load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
+
+all: $(SUBDIRS:%=%\all)
diff --git a/xorg-server/xkbdata.src/rules/makefile b/xorg-server/xkbdata.src/rules/makefile
new file mode 100644
index 000000000..e130c3a7b
--- /dev/null
+++ b/xorg-server/xkbdata.src/rules/makefile
@@ -0,0 +1,26 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\rules
+$(DESTDIR):
+	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+dist_xkbdata_rules_DATA = \
+	README \
+	sgi \
+	sgi.lst \
+	sun \
+	sun.lst \
+	xfree98 \
+	xfree98.lst \
+	xkb.dtd \
+	xml2lst.pl \
+	xorg \
+	xorg-it.lst \
+	xorg.lst \
+	xorg.xml 
+
+DATA_FILES=$(dist_xkbdata_rules_DATA:%=$(DESTDIR)\%)
+
+include ..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/semantics/makefile b/xorg-server/xkbdata.src/semantics/makefile
new file mode 100644
index 000000000..806ca60f4
--- /dev/null
+++ b/xorg-server/xkbdata.src/semantics/makefile
@@ -0,0 +1,19 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+THISDIR=semantics
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
+$(DESTDIR):
+	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+dist_xkbdata_semantics_DATA = \
+	basic \
+	complete \
+	default \
+	xtest
+
+DATA_FILES=$(dist_xkbdata_semantics_DATA:%=$(DESTDIR)\%)
+
+include ..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/symbols/makefile b/xorg-server/xkbdata.src/symbols/makefile
new file mode 100644
index 000000000..82bdbea58
--- /dev/null
+++ b/xorg-server/xkbdata.src/symbols/makefile
@@ -0,0 +1,136 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+THISDIR=symbols
+
+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
+
+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
+
+DATA_FILES=$(dist_xkbdata_symbols_DATA:%=$(DESTDIR)\%)
+
+load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=0 DEBUG=$(DEBUG);)
+
+.PHONY: extrastuff
+
+extrastuff: $(SUBDIRS:%=%\all)
+
+include ..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/types/makefile b/xorg-server/xkbdata.src/types/makefile
new file mode 100644
index 000000000..98271716a
--- /dev/null
+++ b/xorg-server/xkbdata.src/types/makefile
@@ -0,0 +1,26 @@
+ifeq ($(MAKESERVER),1)
+$(error Please do not specify MAKESERVER=1)
+endif
+
+THISDIR=types
+
+DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
+$(DESTDIR):
+	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
+
+dist_xkbdata_types_DATA = \
+	basic \
+	cancel \
+	caps \
+	complete \
+	default \
+	extra \
+	iso9995 \
+	mousekeys \
+	numpad \
+	pc \
+	README 
+
+DATA_FILES=$(dist_xkbdata_types_DATA:%=$(DESTDIR)\%)
+
+include ..\xkbrules.mak
diff --git a/xorg-server/xkbdata.src/xkbrules.mak b/xorg-server/xkbdata.src/xkbrules.mak
new file mode 100644
index 000000000..e13c0a28b
--- /dev/null
+++ b/xorg-server/xkbdata.src/xkbrules.mak
@@ -0,0 +1,14 @@
+DIRFILE=$(THISDIR:%=$(DESTDIR)\..\%.dir)
+all: $(DESTDIR) $(DATA_FILES) $(DIRFILE)
+
+$(DESTDIR)\default: default
+	copy $< $@
+
+$(DESTDIR)\%: %
+	copy $< $@
+
+ifneq ($(DIRFILE),)
+$(DIRFILE): extrastuff $(DATA_FILES)
+	-del -e $@
+	cd $(DESTDIR) & ..\..\xkbcomp.exe -lfhlpR -o $(relpath $@) *
+endif