From af97f4a7350089d18b3894c72996bbfe2b138710 Mon Sep 17 00:00:00 2001 From: PB Date: Sun, 20 Nov 2022 10:46:26 +0100 Subject: [PATCH] Regenerate utils makefiles emulator and execmon were removed, so utils makefiles must be regenerated from the updated bakefile. --- utils/Makefile.in | 30 +++++------------------------- utils/makefile.gcc | 13 ++----------- utils/makefile.vc | 18 +----------------- 3 files changed, 8 insertions(+), 53 deletions(-) diff --git a/utils/Makefile.in b/utils/Makefile.in index 8ef843d798..978269afe5 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -21,19 +21,17 @@ DESTDIR = ### Targets: ### -all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc +all: 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) @@ -42,29 +40,12 @@ clean: distclean: clean rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile - -(cd emulator/src && $(MAKE) distclean) - -(cd execmon && $(MAKE) distclean) -(cd helpview/src && $(MAKE) distclean) -(cd hhp2cached && $(MAKE) distclean) -(cd ifacecheck/src && $(MAKE) distclean) -(cd screenshotgen/src && $(MAKE) distclean) -(cd wxrc && $(MAKE) distclean) -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,8 +92,7 @@ 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 \ +.PHONY: all install uninstall clean distclean helpview hhp2cached ifacecheck \ install_ifacecheck uninstall_ifacecheck install-strip_ifacecheck \ screenshotgen install_screenshotgen uninstall_screenshotgen \ install-strip_screenshotgen wxrc install_wxrc uninstall_wxrc \ diff --git a/utils/makefile.gcc b/utils/makefile.gcc index c0f0c17940..4872e42792 100644 --- a/utils/makefile.gcc +++ b/utils/makefile.gcc @@ -36,25 +36,17 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \ ### Targets: ### -all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc +all: 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 $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) 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 @@ -70,8 +62,7 @@ screenshotgen: wxrc: $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) all -.PHONY: all clean emulator execmon helpview hhp2cached ifacecheck screenshotgen \ - wxrc +.PHONY: all clean helpview hhp2cached ifacecheck screenshotgen wxrc SHELL := $(COMSPEC) diff --git a/utils/makefile.vc b/utils/makefile.vc index 681e0f99d4..e9bdedaf5a 100644 --- a/utils/makefile.vc +++ b/utils/makefile.vc @@ -36,18 +36,12 @@ 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_helpview sub_hhp2cached sub_ifacecheck sub_screenshotgen sub_wxrc clean: -if exist .\*.obj del .\*.obj -if exist .\*.res del .\*.res -if exist .\*.pch del .\*.pch - 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,16 +58,6 @@ clean: $(MAKE) -f makefile.vc $(MAKEARGS) clean cd "$(MAKEDIR)" -sub_emulator: - cd emulator\src - $(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