Solved parallel build problem starting from a clean tree

4 files changed, 45 insertions, 22 deletions

diff --git a/xorg-server/fonts.src/100dpi/makefile b/xorg-server/fonts.src/100dpi/makefile
index 8f5ad2997..7112c3275 100644
--- a/xorg-server/fonts.src/100dpi/makefile
+++ b/xorg-server/fonts.src/100dpi/makefile
@@ -4,7 +4,17 @@ endif
 
 INC_BDF_RULES=1
 
-all: $(BDFTOPCF)
+UTIL_DIR = ..\font-util
+
+load_makefile $(UTIL_DIR)\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+UCS2ANY = $(UTIL_DIR)\$(OBJDIR)\ucs2any.exe
+
+   # The following rule is to avoid parallel build problems
+.PHONY: buildtoolsfirst
+buildtoolsfirst: $(BDFTOPCF) $(UCS2ANY)
+
+all: buildtoolsfirst
 
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\100dpi
 
@@ -253,11 +263,6 @@ ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-14.pcf.gz)
 
 ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-15.pcf.gz)
 
-UTIL_DIR = ..\font-util
-UCS2ANY = $(UTIL_DIR)\$(OBJDIR)\ucs2any.exe
-
-load_makefile $(UTIL_DIR)\makefile MAKESERVER=0 DEBUG=$(DEBUG)
-
 $(DESTDIR)\%-ISO8859-1.pcf.gz: %.bdf
 	@del -e $(<:%.bdf=%-ISO8859-1.bdf)
 	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-1 ISO8859-1
@@ -333,7 +338,7 @@ font_DATA = \
 	$(ISO8859_14_PCF_FILES) \
 	$(ISO8859_15_PCF_FILES)
 
-all: $(DESTDIR) $(UCS2ANY) $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias
+all: $(DESTDIR) $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias
 
 MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
 
diff --git a/xorg-server/fonts.src/75dpi/makefile b/xorg-server/fonts.src/75dpi/makefile
index 06c42b5c0..2467889d9 100644
--- a/xorg-server/fonts.src/75dpi/makefile
+++ b/xorg-server/fonts.src/75dpi/makefile
@@ -4,7 +4,17 @@ endif
 
 INC_BDF_RULES=1
 
-all: $(BDFTOPCF)
+UTIL_DIR = ..\font-util
+
+load_makefile $(UTIL_DIR)\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+UCS2ANY = $(UTIL_DIR)\$(OBJDIR)\ucs2any.exe
+
+   # The following rule is to avoid parallel build problems
+.PHONY: buildtoolsfirst
+buildtoolsfirst: $(BDFTOPCF) $(UCS2ANY)
+
+all: buildtoolsfirst
 
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\75dpi
 
@@ -253,11 +263,6 @@ ISO8859_14_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-14.pcf.gz)
 
 ISO8859_15_PCF_FILES = $(BDF2UCS_FONT_FILES:%=$(DESTDIR)\%-ISO8859-15.pcf.gz)
 
-UTIL_DIR = ..\font-util
-UCS2ANY = $(UTIL_DIR)\$(OBJDIR)\ucs2any.exe
-
-load_makefile $(UTIL_DIR)\makefile MAKESERVER=0 DEBUG=$(DEBUG)
-
 $(DESTDIR)\%-ISO8859-1.pcf.gz: %.bdf
 	@del -e $(<:%.bdf=%-ISO8859-1.bdf)
 	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-1 ISO8859-1
@@ -333,7 +338,11 @@ font_DATA = \
 	$(ISO8859_14_PCF_FILES) \
 	$(ISO8859_15_PCF_FILES)
 
-all: $(DESTDIR) $(UCS2ANY) $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias
+all: $(DESTDIR) $(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) $(MKFONTSCALE)
 	del -e $@
diff --git a/xorg-server/fonts.src/misc/makefile b/xorg-server/fonts.src/misc/makefile
index 1ac7d367a..95d736477 100644
--- a/xorg-server/fonts.src/misc/makefile
+++ b/xorg-server/fonts.src/misc/makefile
@@ -4,7 +4,17 @@ endif
 
 INC_BDF_RULES=1
 
-all: $(BDFTOPCF)
+UTIL_DIR = ..\font-util
+
+load_makefile $(UTIL_DIR)\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+UCS2ANY = $(UTIL_DIR)\$(OBJDIR)\ucs2any.exe
+
+   # The following rule is to avoid parallel build problems
+.PHONY: buildtoolsfirst
+buildtoolsfirst: $(BDFTOPCF) $(UCS2ANY)
+
+all: buildtoolsfirst
 
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\misc
 
@@ -185,11 +195,6 @@ KOI8_R_PCF_FILES = $(BDF2UCS_KOI8_FONT_FILES:%=$(DESTDIR)\%-KOI8-R.pcf.gz)
 
 JISX0201_PCF_FILES = $(BDF2UCS_JISX0201_FONT_FILES:%=$(DESTDIR)\%-JISX0201.1976-0.pcf.gz)
 
-UTIL_DIR = ..\font-util
-UCS2ANY = $(UTIL_DIR)\$(OBJDIR)\ucs2any.exe
-
-load_makefile $(UTIL_DIR)\makefile MAKESERVER=0 DEBUG=$(DEBUG)
-
 $(DESTDIR)\%-ISO8859-1.pcf.gz: %.bdf
 	@del -e $(<:%.bdf=%-ISO8859-1.bdf)
 	$(UCS2ANY) $< $(UTIL_DIR)\map-ISO8859-1 ISO8859-1
@@ -321,7 +326,7 @@ font_DATA = \
 	$(KOI8_R_PCF_FILES) \
 	$(JISX0201_PCF_FILES)
 
-all: $(DESTDIR) $(UCS2ANY) $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias
+all: $(DESTDIR) $(DESTDIR)\fonts.dir $(DESTDIR)\fonts.alias
 
 MKFONTSCALE=$(MHMAKECONF)\mkfontscale\$(OBJDIR)\mkfontscale.exe
 
diff --git a/xorg-server/fonts.src/terminus-font/Makefile b/xorg-server/fonts.src/terminus-font/Makefile
index 9bb030186..5ec26f140 100644
--- a/xorg-server/fonts.src/terminus-font/Makefile
+++ b/xorg-server/fonts.src/terminus-font/Makefile
@@ -6,7 +6,11 @@ UCS2ANY = perl ucstoany.pl
 
 INC_BDF_RULES=1
 
-all: $(BDFTOPCF)
+   # The following rule is to avoid parallel build problems
+.PHONY: buildtoolsfirst
+buildtoolsfirst: $(BDFTOPCF)
+
+all: buildtoolsfirst
 
 DESTDIR=$(MHMAKECONF)\xorg-server\fonts\terminus-font