From 63f4968cd18cd1cdf757a610c774f701aad6144c Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 12 Sep 2009 15:29:11 +0000 Subject: [PATCH] Disable build of utils/execmon. Bakefile for this program doesn't exist so its makefiles are out of date and it doesn't build any more now, disable its build until the bakefile is checked in. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61894 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- utils/Makefile.in | 27 ++++++--------------------- utils/makefile.bcc | 12 +----------- utils/makefile.gcc | 9 ++------- utils/makefile.vc | 10 +--------- utils/makefile.wat | 10 +--------- utils/utils.bkl | 3 +++ 6 files changed, 14 insertions(+), 57 deletions(-) diff --git a/utils/Makefile.in b/utils/Makefile.in index dbc96d8fce..85e98f4702 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -21,19 +21,18 @@ DESTDIR = ### Targets: ### -all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc +all: emulator helpview hhp2cached ifacecheck screenshotgen wxrc -install: install_execmon install_ifacecheck install_screenshotgen install_wxrc +install: install_ifacecheck install_screenshotgen install_wxrc -uninstall: uninstall_execmon uninstall_ifacecheck uninstall_screenshotgen uninstall_wxrc +uninstall: uninstall_ifacecheck uninstall_screenshotgen uninstall_wxrc -install-strip: install install-strip_execmon install-strip_ifacecheck install-strip_screenshotgen install-strip_wxrc +install-strip: install 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) @@ -43,7 +42,6 @@ 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) @@ -53,18 +51,6 @@ 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) @@ -111,9 +97,8 @@ install-strip_wxrc: # Include dependency info, if present: @IF_GNU_MAKE@-include ./.deps/*.d -.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 \ +.PHONY: all install uninstall clean distclean emulator 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 471f64ec9d..60021bcc61 100644 --- a/utils/makefile.bcc +++ b/utils/makefile.bcc @@ -44,7 +44,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \ ### Targets: ### -all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc +all: emulator helpview hhp2cached ifacecheck screenshotgen wxrc clean: -if exist .\*.obj del .\*.obj @@ -54,10 +54,6 @@ 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 @@ -85,12 +81,6 @@ 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 aa8fd05129..24d266118d 100644 --- a/utils/makefile.gcc +++ b/utils/makefile.gcc @@ -35,13 +35,12 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ ### Targets: ### -all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc +all: emulator 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 @@ -51,9 +50,6 @@ 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 @@ -69,8 +65,7 @@ screenshotgen: wxrc: $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) all -.PHONY: all clean emulator execmon helpview hhp2cached ifacecheck screenshotgen \ - wxrc +.PHONY: all clean emulator helpview hhp2cached ifacecheck screenshotgen wxrc SHELL := $(COMSPEC) diff --git a/utils/makefile.vc b/utils/makefile.vc index ca1a53032a..b8f6b8e2e2 100644 --- 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_execmon sub_helpview sub_hhp2cached sub_ifacecheck sub_screenshotgen sub_wxrc +all: sub_emulator sub_helpview sub_hhp2cached sub_ifacecheck sub_screenshotgen sub_wxrc clean: -if exist .\*.obj del .\*.obj @@ -43,9 +43,6 @@ 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)" @@ -67,11 +64,6 @@ 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 a8b1517d6a..b578e98ec3 100644 --- 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 execmon helpview hhp2cached ifacecheck screenshotgen wxrc +all : .SYMBOLIC emulator helpview hhp2cached ifacecheck screenshotgen wxrc clean : .SYMBOLIC -if exist .\*.obj del .\*.obj @@ -63,9 +63,6 @@ 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) @@ -87,11 +84,6 @@ 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 0318209a85..d72a25ae1b 100644 --- a/utils/utils.bkl +++ b/utils/utils.bkl @@ -12,10 +12,13 @@ no + helpview/src -- 2.45.2