diff --git a/utils/Makefile.in b/utils/Makefile.in
index e77831c147..ebec162d12 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -20,20 +20,32 @@ DESTDIR =
### Targets: ###
-all: tex2rtf helpgen
+all: configtool emulator helpview tex2rtf helpgen
clean:
rm -rf ./.deps ./.pch
rm -f ./*.o
+ (cd configtool/src && $(MAKE) clean)
+ (cd emulator/src && $(MAKE) clean)
+ (cd helpview/src && $(MAKE) clean)
(cd tex2rtf/src && $(MAKE) clean)
(cd HelpGen && $(MAKE) clean)
+configtool:
+ (cd configtool/src && $(MAKE) all)
+
distclean: clean
rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
+emulator:
+ (cd emulator/src && $(MAKE) all)
+
helpgen:
(cd HelpGen && $(MAKE) all)
+helpview:
+ (cd helpview/src && $(MAKE) all)
+
install: all
(cd tex2rtf/src && $(MAKE) install)
(cd HelpGen && $(MAKE) install)
@@ -51,4 +63,4 @@ uninstall:
# Include dependency info, if present:
@IF_GNU_MAKE@-include .deps/*.d
-.PHONY: all clean distclean helpgen install tex2rtf uninstall
+.PHONY: all clean configtool distclean emulator helpgen helpview install tex2rtf uninstall
diff --git a/utils/makefile.bcc b/utils/makefile.bcc
index b5809588b6..8bd811d588 100644
--- a/utils/makefile.bcc
+++ b/utils/makefile.bcc
@@ -36,17 +36,32 @@ MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
### Targets: ###
-all: tex2rtf helpgen
+all: configtool emulator helpview tex2rtf helpgen
clean:
-if exist .\*.obj del .\*.obj
-if exist .\*.res del .\*.res
+configtool:
+ cd configtool\src
+ $(MAKE) -f makefile.bcc $(MAKEARGS) all
+ cd ..\..
+
+emulator:
+ cd emulator\src
+ $(MAKE) -f makefile.bcc $(MAKEARGS) all
+ cd ..\..
+
helpgen:
cd HelpGen
$(MAKE) -f makefile.bcc $(MAKEARGS) all
cd ..
+helpview:
+ cd helpview\src
+ $(MAKE) -f makefile.bcc $(MAKEARGS) all
+ cd ..\..
+
tex2rtf:
cd tex2rtf\src
$(MAKE) -f makefile.bcc $(MAKEARGS) all
diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index 3bb3a17662..7d78d3c6ae 100644
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -28,15 +28,24 @@ MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
### Targets: ###
-all: tex2rtf helpgen
+all: configtool emulator helpview tex2rtf helpgen
clean:
-if exist .\*.o del .\*.o
+configtool:
+ $(MAKE) -C configtool\src -f makefile.gcc $(MAKEARGS) all
+
+emulator:
+ $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
+
helpgen:
$(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) all
+helpview:
+ $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all
+
tex2rtf:
$(MAKE) -C tex2rtf\src -f makefile.gcc $(MAKEARGS) all
-.PHONY: all clean helpgen tex2rtf
+.PHONY: all clean configtool emulator helpgen helpview tex2rtf
diff --git a/utils/makefile.vc b/utils/makefile.vc
index 9e812ce3cc..bf71de1329 100644
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -27,17 +27,32 @@ MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
### Targets: ###
-all: sub_tex2rtf sub_helpgen
+all: sub_configtool sub_emulator sub_helpview sub_tex2rtf sub_helpgen
clean:
-if exist .\*.obj del .\*.obj
-if exist .\*.res del .\*.res
+sub_configtool:
+ cd configtool\src
+ $(MAKE) -f makefile.vc $(MAKEARGS) all
+ cd $(MAKEDIR)
+
+sub_emulator:
+ cd emulator\src
+ $(MAKE) -f makefile.vc $(MAKEARGS) all
+ cd $(MAKEDIR)
+
sub_helpgen:
cd HelpGen
$(MAKE) -f makefile.vc $(MAKEARGS) all
cd $(MAKEDIR)
+sub_helpview:
+ cd helpview\src
+ $(MAKE) -f makefile.vc $(MAKEARGS) all
+ cd $(MAKEDIR)
+
sub_tex2rtf:
cd tex2rtf\src
$(MAKE) -f makefile.vc $(MAKEARGS) all
diff --git a/utils/makefile.wat b/utils/makefile.wat
index 7850821725..ce7eff3a86 100644
--- a/utils/makefile.wat
+++ b/utils/makefile.wat
@@ -42,7 +42,7 @@ MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" &
### Targets: ###
-all : .SYMBOLIC tex2rtf helpgen
+all : .SYMBOLIC configtool emulator helpview tex2rtf helpgen
clean : .SYMBOLIC
-if exist .\*.obj del .\*.obj
@@ -50,11 +50,26 @@ clean : .SYMBOLIC
-if exist .\*.lbc del .\*.lbc
-if exist .\*.ilk del .\*.ilk
+configtool : .SYMBOLIC
+ cd configtool\src
+ wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+ cd $(WATCOM_CWD)
+
+emulator : .SYMBOLIC
+ cd emulator\src
+ wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+ cd $(WATCOM_CWD)
+
helpgen : .SYMBOLIC
cd HelpGen
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
cd $(WATCOM_CWD)
+helpview : .SYMBOLIC
+ cd helpview\src
+ wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+ cd $(WATCOM_CWD)
+
tex2rtf : .SYMBOLIC
cd tex2rtf\src
wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
diff --git a/utils/utils.bkl b/utils/utils.bkl
index f9a78d79ee..e173c32595 100644
--- a/utils/utils.bkl
+++ b/utils/utils.bkl
@@ -7,6 +7,21 @@
all
+
+ configtool/src
+ no
+
+
+
+ emulator/src
+ no
+
+
+
+ helpview/src
+ no
+
+
tex2rtf/src
yes