solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Regenerate utils makefiles

Browse source 
emulator and execmon were removed, so utils makefiles
must be regenerated from the updated bakefile.
This commit is contained in:
PB 2022-11-20 10:46:26 +01:00
parent 8030d3124a
commit af97f4a735
3 changed files with 8 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

30
utils/Makefile.in
View file

@ -21,19 +21,17 @@ DESTDIR =
### Targets: ### ### 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: clean:
rm -rf ./.deps ./.pch rm -rf ./.deps ./.pch
rm -f ./*.o rm -f ./*.o
-(cd emulator/src && $(MAKE) clean)
-(cd execmon && $(MAKE) clean)
-(cd helpview/src && $(MAKE) clean) -(cd helpview/src && $(MAKE) clean)
-(cd hhp2cached && $(MAKE) clean) -(cd hhp2cached && $(MAKE) clean)
-(cd ifacecheck/src && $(MAKE) clean) -(cd ifacecheck/src && $(MAKE) clean)
@ -42,29 +40,12 @@ clean:
distclean: clean distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch Makefile 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 helpview/src && $(MAKE) distclean)
-(cd hhp2cached && $(MAKE) distclean) -(cd hhp2cached && $(MAKE) distclean)
-(cd ifacecheck/src && $(MAKE) distclean) -(cd ifacecheck/src && $(MAKE) distclean)
-(cd screenshotgen/src && $(MAKE) distclean) -(cd screenshotgen/src && $(MAKE) distclean)
-(cd wxrc && $(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: helpview:
(cd helpview/src && $(MAKE) all) (cd helpview/src && $(MAKE) all)
@ -111,8 +92,7 @@ install-strip_wxrc:
# Include dependency info, if present: # Include dependency info, if present:
@IF_GNU_MAKE@-include ./.deps/*.d @IF_GNU_MAKE@-include ./.deps/*.d
.PHONY: all install uninstall clean distclean emulator execmon install_execmon \ .PHONY: all install uninstall clean distclean helpview hhp2cached ifacecheck \
uninstall_execmon install-strip_execmon helpview hhp2cached ifacecheck \
install_ifacecheck uninstall_ifacecheck install-strip_ifacecheck \ install_ifacecheck uninstall_ifacecheck install-strip_ifacecheck \
screenshotgen install_screenshotgen uninstall_screenshotgen \ screenshotgen install_screenshotgen uninstall_screenshotgen \
install-strip_screenshotgen wxrc install_wxrc uninstall_wxrc \ install-strip_screenshotgen wxrc install_wxrc uninstall_wxrc \

13
utils/makefile.gcc
View file

@ -36,25 +36,17 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
### Targets: ### ### Targets: ###
all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc all: helpview hhp2cached ifacecheck screenshotgen wxrc
clean: clean:
-if exist .\*.o del .\*.o -if exist .\*.o del .\*.o
-if exist .\*.d del .\*.d -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 helpview\src -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) clean $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C ifacecheck\src -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 screenshotgen\src -f makefile.gcc $(MAKEARGS) clean
$(MAKE) -C wxrc -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: helpview:
$(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all
@ -70,8 +62,7 @@ screenshotgen:
wxrc: wxrc:
$(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) all $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) all
.PHONY: all clean emulator execmon helpview hhp2cached ifacecheck screenshotgen \ .PHONY: all clean helpview hhp2cached ifacecheck screenshotgen wxrc
wxrc
SHELL := $(COMSPEC) SHELL := $(COMSPEC)

18
utils/makefile.vc
View file

@ -36,18 +36,12 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
### Targets: ### ### 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: clean:
-if exist .\*.obj del .\*.obj -if exist .\*.obj del .\*.obj
-if exist .\*.res del .\*.res -if exist .\*.res del .\*.res
-if exist .\*.pch del .\*.pch -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 cd helpview\src
$(MAKE) -f makefile.vc $(MAKEARGS) clean $(MAKE) -f makefile.vc $(MAKEARGS) clean
cd "$(MAKEDIR)" cd "$(MAKEDIR)"
@ -64,16 +58,6 @@ clean:
$(MAKE) -f makefile.vc $(MAKEARGS) clean $(MAKE) -f makefile.vc $(MAKEARGS) clean
cd "$(MAKEDIR)" 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: sub_helpview:
cd helpview\src cd helpview\src
$(MAKE) -f makefile.vc $(MAKEARGS) all $(MAKE) -f makefile.vc $(MAKEARGS) all