fixed utils.bkl to include all utils

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24067 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/utils/Makefile.in b/utils/Makefile.in
index e77831c147e2bc8c7b237a87f52e088de7b8c64d..ebec162d1232741f9ff6ccee0c4a907974dc6292 100644 (file)
--- 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 b5809588b6bdc00c2fcf80355f42d0fd03d4b72d..8bd811d58822d09fa4352b09f59d5350864d8f5f 100644 (file)
--- 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 3bb3a17662ed88af21bb7476ec7b7f5699e607ae..7d78d3c6aecfb098df703279938f04bf032d77d3 100644 (file)
--- 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 9e812ce3cc8e6b5e65cb6854519a5bf0b6a084c5..bf71de13297ff661e61dd903faae7228f5b0c318 100644 (file)
--- 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 7850821725e089ea97ebd30e800dfcf8755ce329..ce7eff3a86608a1838e71f8cd47dcd9507f09099 100644 (file)
--- 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 f9a78d79eea48370de7f3399b2ef8a7371edd1ad..e173c325950ba00e32bffc638547bea56ad7a269 100644 (file)
--- a/utils/utils.bkl
+++ b/utils/utils.bkl
@@ -7,6 +7,21 @@
         <dependency-of>all</dependency-of>
     </template>
 
+    <subproject id="configtool" template="sub">
+        <dir>configtool/src</dir>
+        <installable>no</installable>
+    </subproject>
+    
+    <subproject id="emulator" template="sub">
+        <dir>emulator/src</dir>
+        <installable>no</installable>
+    </subproject>
+    
+    <subproject id="helpview" template="sub">
+        <dir>helpview/src</dir>
+        <installable>no</installable>
+    </subproject>
+    
     <subproject id="tex2rtf" template="sub">
         <dir>tex2rtf/src</dir>
         <installable>yes</installable>