Added building of font.src and xkbdata.src to xorg-server\makefile

13 files changed, 38 insertions, 29 deletions

diff --git a/building.txt b/building.txt
index 1ddf65c50..cac110ddb 100644
--- a/building.txt
+++ b/building.txt
@@ -33,13 +33,6 @@ e.g.: set MHMAKECONF=c:\vcxsrv\trunk
 Building vcxsrv:

 - run 'mhmake MAKESERVER=1' in xorg-server directory

 - run 'mhmake DEBUG=1 MAKESERVER=1' in xorg-server directory for a debugable version

-- run 'mhmake' in bdftopcf

-- run 'mhame' in xorg-server\fonts.src to build the fonts directory

-- run 'mhmake' in xorg-server\xkbdata.src to build the keyboard data

-

-Building xlaunch:

-- run 'mhmake' in 'xorg-server\hw\xwin\xlaunch'

-- run 'mhmake DEBUG=1' in 'xorg-server\hw\xwin\xlaunch' if you want a debugable version.

 

 To build installer:

 - install http://nsis.sourceforge.net

diff --git a/makefile.after b/makefile.after
index 3e3e9d370..5e9692d02 100644
--- a/makefile.after
+++ b/makefile.after
@@ -71,6 +71,7 @@ $(OBJDIR)\%.res : %.rc
 

 ifdef INC_BDF_RULES

 load_makefile $(MHMAKECONF)\bdftopcf\makefile MAKESERVER=0 DEBUG=$(DEBUG)

+load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)

 

 $(DESTDIR)\%.pcf.gz: %.bdf

 	@del -e $@

diff --git a/makefile.before b/makefile.before
index 948fbb0fc..7bc32dcae 100644
--- a/makefile.before
+++ b/makefile.before
@@ -60,7 +60,8 @@ SYSTEMLIBS ?= odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool
 

 CPPFLAGS ?= $(CCFLAGS) -EHa

 

-BDFTOPCF= $(MHMAKECONF)\bdftopcf\$(OBJDIR)\bdftopcf.exe

+BDFTOPCF=$(MHMAKECONF)\bdftopcf\$(OBJDIR)\bdftopcf.exe

+MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe

 

 all: $(OBJDIR)

 

diff --git a/xorg-server/fonts.src/100dpi/makefile b/xorg-server/fonts.src/100dpi/makefile
index e66fefaaf..9514c7fc5 100644
--- a/xorg-server/fonts.src/100dpi/makefile
+++ b/xorg-server/fonts.src/100dpi/makefile
@@ -4,6 +4,8 @@ endif
 
 INC_BDF_RULES=1
 
+all: $(BDFTOPCF)
+
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\100dpi
 $(DESTDIR):
 	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
@@ -339,11 +341,11 @@ MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
 
 load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
 
-$(DESTDIR)\fonts.scale: $(font_DATA)
+$(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE)
 	del -e $@
 	cd $(DESTDIR) & $(MKFONTSCALE) .
 
-$(DESTDIR)\fonts.dir: $(font_DATA)
+$(DESTDIR)\fonts.dir: $(font_DATA) $(MKFONTSCALE)
 	del -e $@
 	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
 
diff --git a/xorg-server/fonts.src/75dpi/makefile b/xorg-server/fonts.src/75dpi/makefile
index 850e53a13..5c613afd5 100644
--- a/xorg-server/fonts.src/75dpi/makefile
+++ b/xorg-server/fonts.src/75dpi/makefile
@@ -4,6 +4,8 @@ endif
 
 INC_BDF_RULES=1
 
+all: $(BDFTOPCF)
+
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\75dpi
 $(DESTDIR):
 	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
@@ -335,15 +337,11 @@ font_DATA = \
 
 all: $(DESTDIR) $(UCS2ANY) $(DESTDIR)\fonts.scale $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias
 
-MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
-
-load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
-
-$(DESTDIR)\fonts.scale: $(font_DATA)
+$(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE)
 	del -e $@
 	cd $(DESTDIR) & $(MKFONTSCALE) .
 
-$(DESTDIR)\fonts.dir: $(font_DATA)
+$(DESTDIR)\fonts.dir: $(font_DATA) $(MKFONTSCALE)
 	del -e $@
 	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
 
diff --git a/xorg-server/fonts.src/OTF/makefile b/xorg-server/fonts.src/OTF/makefile
index 5e5d84814..29df33564 100644
--- a/xorg-server/fonts.src/OTF/makefile
+++ b/xorg-server/fonts.src/OTF/makefile
@@ -2,6 +2,8 @@ ifeq ($(MAKESERVER),1)
 $(error Please do not specify MAKESERVER=1)
 endif
 
+INC_BDF_RULES=1
+
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\OTF
 $(DESTDIR):
 	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
@@ -39,11 +41,11 @@ MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
 
 load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
 
-$(DESTDIR)\fonts.scale: $(font_DATA)
+$(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE)
 	del -e $@
 	cd $(DESTDIR) & $(MKFONTSCALE) .
 
-$(DESTDIR)\fonts.dir: $(font_DATA)
+$(DESTDIR)\fonts.dir: $(font_DATA) $(MKFONTSCALE)
 	del -e $@
 	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
 #	$(FCCACHE) $(DESTDIR)
diff --git a/xorg-server/fonts.src/Speedo/makefile b/xorg-server/fonts.src/Speedo/makefile
index 96223c065..b6de2deef 100644
--- a/xorg-server/fonts.src/Speedo/makefile
+++ b/xorg-server/fonts.src/Speedo/makefile
@@ -2,6 +2,8 @@ ifeq ($(MAKESERVER),1)
 $(error Please do not specify MAKESERVER=1)
 endif
 
+INC_BDF_RULES=1
+
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\Speedo
 $(DESTDIR):
 	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
@@ -26,7 +28,7 @@ MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
 
 load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
 
-$(DESTDIR)\fonts.dir: $(font_DATA)
+$(DESTDIR)\fonts.dir: $(font_DATA) $(MKFONTSCALE)
 	del -e $@
 	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
 
diff --git a/xorg-server/fonts.src/TTF/makefile b/xorg-server/fonts.src/TTF/makefile
index a488a8395..0863f8b08 100644
--- a/xorg-server/fonts.src/TTF/makefile
+++ b/xorg-server/fonts.src/TTF/makefile
@@ -2,6 +2,8 @@ ifeq ($(MAKESERVER),1)
 $(error Please do not specify MAKESERVER=1)
 endif
 
+INC_BDF_RULES=1
+
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\TTF
 $(DESTDIR):
 	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
@@ -40,11 +42,11 @@ MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
 
 load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
 
-$(DESTDIR)\fonts.scale: $(font_DATA)
+$(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE)
 	del -e $@
 	cd $(DESTDIR) & $(MKFONTSCALE) .
 
-$(DESTDIR)\fonts.dir: $(font_DATA)
+$(DESTDIR)\fonts.dir: $(font_DATA) $(MKFONTSCALE)
 	del -e $@
 	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
 #	$(FCCACHE) $(DESTDIR)
diff --git a/xorg-server/fonts.src/Type1/makefile b/xorg-server/fonts.src/Type1/makefile
index 48371a6b2..66e0d008d 100644
--- a/xorg-server/fonts.src/Type1/makefile
+++ b/xorg-server/fonts.src/Type1/makefile
@@ -2,6 +2,8 @@ ifeq ($(MAKESERVER),1)
 $(error Please do not specify MAKESERVER=1)
 endif
 
+INC_BDF_RULES=1
+
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\Type1
 $(DESTDIR):
 	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
@@ -74,11 +76,11 @@ MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
 
 load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
 
-$(DESTDIR)\fonts.scale: $(font_DATA)
+$(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE)
 	del -e $@
 	cd $(DESTDIR) & $(MKFONTSCALE) .
 
-$(DESTDIR)\fonts.dir: $(font_DATA)
+$(DESTDIR)\fonts.dir: $(font_DATA) $(MKFONTSCALE)
 	del -e $@
 	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
 #	$(FCCACHE) $(DESTDIR)
diff --git a/xorg-server/fonts.src/cyrillic/makefile b/xorg-server/fonts.src/cyrillic/makefile
index 439c9e342..2f0a063f3 100644
--- a/xorg-server/fonts.src/cyrillic/makefile
+++ b/xorg-server/fonts.src/cyrillic/makefile
@@ -103,11 +103,11 @@ load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
 
 all: $(DESTDIR) $(MKFONTSCALE) $(DESTDIR)\fonts.scale $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias
 
-$(DESTDIR)\fonts.scale: $(font_DATA)
+$(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE)
 	del -e $@
 	cd $(DESTDIR) & $(MKFONTSCALE) .
 
-$(DESTDIR)\fonts.dir: $(font_DATA)
+$(DESTDIR)\fonts.dir: $(font_DATA) $(MKFONTSCALE)
 	del -e $@
 	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
 
diff --git a/xorg-server/fonts.src/encodings/makefile b/xorg-server/fonts.src/encodings/makefile
index ee3809007..309583614 100644
--- a/xorg-server/fonts.src/encodings/makefile
+++ b/xorg-server/fonts.src/encodings/makefile
@@ -1,7 +1,7 @@
 ifeq ($(MAKESERVER),1)
 $(error Please do not specify MAKESERVER=1)
 endif
-load_makefile large\makefile
+load_makefile large\makefile MAKESERVER=0 DEBUG=0
 
 INC_BDF_RULES=1
 
diff --git a/xorg-server/fonts.src/misc/makefile b/xorg-server/fonts.src/misc/makefile
index 8d274444d..f9c615c65 100644
--- a/xorg-server/fonts.src/misc/makefile
+++ b/xorg-server/fonts.src/misc/makefile
@@ -4,6 +4,8 @@ endif
 
 INC_BDF_RULES=1
 
+all: $(BDFTOPCF)
+
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\misc
 $(DESTDIR):
 	if not isdir "$(DESTDIR)" mkdir /s "$(DESTDIR)"
@@ -327,11 +329,11 @@ MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
 
 load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
 
-$(DESTDIR)\fonts.scale: $(font_DATA)
+$(DESTDIR)\fonts.scale: $(font_DATA) $(MKFONTSCALE)
 	del -e $@
 	cd $(DESTDIR) & $(MKFONTSCALE) .
 
-$(DESTDIR)\fonts.dir: $(font_DATA)
+$(DESTDIR)\fonts.dir: $(font_DATA) $(MKFONTSCALE)
 	del -e $@
 	cd $(DESTDIR) & $(MKFONTSCALE) -b -s -l .
 
diff --git a/xorg-server/makefile b/xorg-server/makefile
index 110645fe2..4416b6ddd 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -92,7 +92,11 @@ load_makefile ..\xkbcomp\makefile MAKESERVER=0 DEBUG=$(DEBUG)
 xkbcomp.exe: ..\xkbcomp\$(OBJDIR:obj\$(OBJDIRPREFIX)%=obj\%)\xkbcomp.exe
 	copy $< $@
 
-all: $(WINAPP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB
+load_makefile ..\libX11\nls\makefile MAKESERVER=0 DEBUG=0
+load_makefile fonts.src\makefile MAKESERVER=0 DEBUG=0
+load_makefile xkbdata.src\makefile MAKESERVER=0 DEBUG=0
+
+all: $(WINAPP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB ..\libX11\nls\all fonts.src\all xkbdata.src\all
 
 protocol.txt: dix\protocol.txt
 	copy $< $@