Reenable build of execmon in utils bakefile.

Undo r61894, it's not necessary to disable build of execmon any longer after
r61901.

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

diff --git a/utils/Makefile.in b/utils/Makefile.in
index 85e98f470278d4b0326a0b1fe6c03f6ad48aa06f..dbc96d8fce86337c6bcd30c1c3f7136ee41d9ed1 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -21,18 +21,19 @@ DESTDIR =
 
 ### Targets: ###
 
-all: emulator helpview hhp2cached ifacecheck screenshotgen wxrc
+all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc
 
-install: install_ifacecheck install_screenshotgen install_wxrc
+install: install_execmon install_ifacecheck install_screenshotgen install_wxrc
 
-uninstall: uninstall_ifacecheck uninstall_screenshotgen uninstall_wxrc
+uninstall: uninstall_execmon uninstall_ifacecheck uninstall_screenshotgen uninstall_wxrc
 
-install-strip: install install-strip_ifacecheck install-strip_screenshotgen install-strip_wxrc
+install-strip: install install-strip_execmon install-strip_ifacecheck install-strip_screenshotgen install-strip_wxrc
 
 clean: 
        rm -rf ./.deps ./.pch
        rm -f ./*.o
        -(cd emulator/src && $(MAKE) clean)
+       -(cd execmon && $(MAKE) clean)
        -(cd helpview/src && $(MAKE) clean)
        -(cd hhp2cached && $(MAKE) clean)
        -(cd ifacecheck/src && $(MAKE) clean)
@@ -42,6 +43,7 @@ clean:
 distclean: clean
        rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
        -(cd emulator/src && $(MAKE) distclean)
+       -(cd execmon && $(MAKE) distclean)
        -(cd helpview/src && $(MAKE) distclean)
        -(cd hhp2cached && $(MAKE) distclean)
        -(cd ifacecheck/src && $(MAKE) distclean)
@@ -51,6 +53,18 @@ distclean: clean
 emulator: 
        (cd emulator/src && $(MAKE) all)
 
+execmon: 
+       (cd execmon && $(MAKE) all)
+
+install_execmon: 
+       (cd execmon && $(MAKE) install)
+
+uninstall_execmon: 
+       (cd execmon && $(MAKE) uninstall)
+
+install-strip_execmon: 
+       (cd execmon && $(MAKE) install-strip)
+
 helpview: 
        (cd helpview/src && $(MAKE) all)
 
@@ -97,8 +111,9 @@ install-strip_wxrc:
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d
 
-.PHONY: all install uninstall clean distclean emulator helpview hhp2cached \
-       ifacecheck install_ifacecheck uninstall_ifacecheck install-strip_ifacecheck \
+.PHONY: all install uninstall clean distclean emulator execmon install_execmon \
+       uninstall_execmon install-strip_execmon helpview hhp2cached ifacecheck \
+       install_ifacecheck uninstall_ifacecheck install-strip_ifacecheck \
        screenshotgen install_screenshotgen uninstall_screenshotgen \
        install-strip_screenshotgen wxrc install_wxrc uninstall_wxrc \
        install-strip_wxrc

diff --git a/utils/makefile.bcc b/utils/makefile.bcc
index 60021bcc61e339b5ee15ce69bf0589c539582d17..471f64ec9dfd2a8b334535b51a37a1ca634ee7f8 100644 (file)
--- a/utils/makefile.bcc
+++ b/utils/makefile.bcc
@@ -44,7 +44,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 
 ### Targets: ###
 
-all: emulator helpview hhp2cached ifacecheck screenshotgen wxrc
+all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc
 
 clean: 
        -if exist .\*.obj del .\*.obj
@@ -54,6 +54,10 @@ clean:
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>emulator.bat
        call emulator.bat
        @del emulator.bat
+       @echo cd execmon >execmon.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>execmon.bat
+       call execmon.bat
+       @del execmon.bat
        @echo cd helpview\src >helpview.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpview.bat
        call helpview.bat
@@ -81,6 +85,12 @@ emulator:
        call emulator.bat
        @del emulator.bat
 
+execmon: 
+       @echo cd execmon >execmon.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>execmon.bat
+       call execmon.bat
+       @del execmon.bat
+
 helpview: 
        @echo cd helpview\src >helpview.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpview.bat

diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index 24d266118db1d8adb1a23d6495f14cddd9ab1cda..aa8fd05129d16dff42a56618d869a29952b21a60 100644 (file)
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -35,12 +35,13 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 
 ### Targets: ###
 
-all: emulator helpview hhp2cached ifacecheck screenshotgen wxrc
+all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc
 
 clean: 
        -if exist .\*.o del .\*.o
        -if exist .\*.d del .\*.d
        $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) clean
        $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) clean
@@ -50,6 +51,9 @@ clean:
 emulator: 
        $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
 
+execmon: 
+       $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) all
+
 helpview: 
        $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all
 
@@ -65,7 +69,8 @@ screenshotgen:
 wxrc: 
        $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all clean emulator helpview hhp2cached ifacecheck screenshotgen wxrc
+.PHONY: all clean emulator execmon helpview hhp2cached ifacecheck screenshotgen \
+       wxrc
 
 
 SHELL := $(COMSPEC)

diff --git a/utils/makefile.vc b/utils/makefile.vc
index b8f6b8e2e2c3e1891451af7cf87a3d5ff53e6e3b..ca1a53032adda5ec37fab587322400b0e84c9196 100644 (file)
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -34,7 +34,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### Targets: ###
 
-all: sub_emulator sub_helpview sub_hhp2cached sub_ifacecheck sub_screenshotgen sub_wxrc
+all: sub_emulator sub_execmon sub_helpview sub_hhp2cached sub_ifacecheck sub_screenshotgen sub_wxrc
 
 clean: 
        -if exist .\*.obj del .\*.obj
@@ -43,6 +43,9 @@ clean:
        cd emulator\src
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
        cd "$(MAKEDIR)"
+       cd execmon
+       $(MAKE) -f makefile.vc $(MAKEARGS) clean
+       cd "$(MAKEDIR)"
        cd helpview\src
        $(MAKE) -f makefile.vc $(MAKEARGS) clean
        cd "$(MAKEDIR)"
@@ -64,6 +67,11 @@ sub_emulator:
        $(MAKE) -f makefile.vc $(MAKEARGS) all
        cd "$(MAKEDIR)"
 
+sub_execmon: 
+       cd execmon
+       $(MAKE) -f makefile.vc $(MAKEARGS) all
+       cd "$(MAKEDIR)"
+
 sub_helpview: 
        cd helpview\src
        $(MAKE) -f makefile.vc $(MAKEARGS) all

diff --git a/utils/makefile.wat b/utils/makefile.wat
index b578e98ec3f19ae6e08836e9b7f813d31a18fd5a..a8b1517d6ab40c9a4454df972593024e5ccb52b7 100644 (file)
--- a/utils/makefile.wat
+++ b/utils/makefile.wat
@@ -52,7 +52,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
 
 ### Targets: ###
 
-all : .SYMBOLIC emulator helpview hhp2cached ifacecheck screenshotgen wxrc
+all : .SYMBOLIC emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc
 
 clean : .SYMBOLIC 
        -if exist .\*.obj del .\*.obj
@@ -63,6 +63,9 @@ clean : .SYMBOLIC
        cd emulator\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)
+       cd execmon
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+       cd $(WATCOM_CWD)
        cd helpview\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)
@@ -84,6 +87,11 @@ emulator : .SYMBOLIC
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 
+execmon : .SYMBOLIC 
+       cd execmon
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
 helpview : .SYMBOLIC 
        cd helpview\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all

diff --git a/utils/utils.bkl b/utils/utils.bkl
index d72a25ae1bb1e7652e3f82ea063fb7445986cb9f..0318209a85304d4503788ca12707d923dd06502e 100644 (file)
--- a/utils/utils.bkl
+++ b/utils/utils.bkl
@@ -12,13 +12,10 @@
         <installable>no</installable>
     </subproject>
 
-    <!--
-        Disabled for now as bakefile is unavailable.
     <subproject id="execmon" template="sub">
         <dir>execmon</dir>
         <installable>yes</installable>
     </subproject>
-     -->
 
     <subproject id="helpview" template="sub">
         <dir>helpview/src</dir>