[Scummvm-git-logs] scummvm-tools master -> a16e5c4529d4408d8481918e02f1148c2edea19c

[bonki]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm-tools' repo located at https://github.com/scummvm/scummvm-tools .

Summary:
a16e5c4529 RISCOS: Avoid hard-coding the list of tools when creating the application


Commit: a16e5c4529d4408d8481918e02f1148c2edea19c
    https://github.com/scummvm/scummvm-tools/commit/a16e5c4529d4408d8481918e02f1148c2edea19c
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2018-05-18T16:19:45Z

Commit Message:
RISCOS: Avoid hard-coding the list of tools when creating the application

Changed paths:
    Makefile
    dists/riscos/!Boot,feb


diff --git a/Makefile b/Makefile
index 0109d9a..3ae1d26 100644
--- a/Makefile
+++ b/Makefile
@@ -266,43 +266,32 @@ endif
 # RISC OS specific
 #
 
+ifdef QUIET
+QUIET_ELF2AIF = @echo '   ' ELF2AIF '' $@;
+endif
+
+, := ,
+
 # Special target to create an RISC OS snapshot installation
-riscosdist: all
-	mkdir -p !ScummTool
-	cp ${srcdir}/dists/riscos/!Boot,feb !ScummTool/!Boot,feb
+riscosdist: all riscosboot $(addprefix !ScummTool/bin/,$(addsuffix $(,)ff8,$(PROGRAMS)))
 	cp ${srcdir}/dists/riscos/!Run,feb !ScummTool/!Run,feb
 	cp ${srcdir}/dists/riscos/!Sprites,ff9 !ScummTool/!Sprites,ff9
 	cp ${srcdir}/dists/riscos/!Sprites11,ff9 !ScummTool/!Sprites11,ff9
 	cp $(srcdir)/README !ScummTool/!Help,fff
 	cp $(srcdir)/COPYING !ScummTool/COPYING,fff
 	cp $(srcdir)/NEWS !ScummTool/NEWS,fff
-	mkdir -p !ScummTool/bin
-	elf2aif construct_mohawk$(EXEEXT) !ScummTool/bin/construct_mohawk,ff8
-	elf2aif decine$(EXEEXT) !ScummTool/bin/decine,ff8
-	elf2aif degob$(EXEEXT) !ScummTool/bin/degob,ff8
-	elf2aif dekyra$(EXEEXT) !ScummTool/bin/dekyra,ff8
-	elf2aif deprince$(EXEEXT) !ScummTool/bin/deprince,ff8
-	elf2aif deriven$(EXEEXT) !ScummTool/bin/deriven,ff8
-	elf2aif descumm$(EXEEXT) !ScummTool/bin/descumm,ff8
-	elf2aif desword2$(EXEEXT) !ScummTool/bin/desword2,ff8
-	elf2aif extract_mohawk$(EXEEXT) !ScummTool/bin/extract_mohawk,ff8
-	elf2aif gob_loadcalc$(EXEEXT) !ScummTool/bin/gob_loadcalc,ff8
-	elf2aif scummvm-tools-cli$(EXEEXT) !ScummTool/bin/scummvm-tools-cli,ff8
-ifeq "$(USE_FREETYPE)" "1"
-ifeq "$(USE_ICONV)" "1"
-	elf2aif create_sjisfnt$(EXEEXT) !ScummTool/bin/create_sjisfnt,ff8
-	echo "Set Alias\$$create_sjisfnt <ScummTool\$$Dir>.bin.create_sjisfnt %%*0" >> !ScummTool/!Boot,feb
-endif
-endif
-ifeq "$(USE_BOOST)" "1"
-	elf2aif decompile$(EXEEXT) !ScummTool/bin/decompile,ff8
-	echo "Set Alias\$$decompile <ScummTool\$$Dir>.bin.decompile %%*0" >> !ScummTool/!Boot,feb
-endif
 ifeq "$(USE_WXWIDGETS)" "1"
-	elf2aif scummvm-tools$(EXEEXT) !ScummTool/bin/scummvm-tools,ff8
-	echo "Set Alias\$$scummvm-tools <ScummTool\$$Dir>.bin.scummvm-tools %%*0" >> !ScummTool/!Boot,feb
 	mkdir -p !ScummTool/bin/media
 	cp $(srcdir)/gui/media/detaillogo.jpg !ScummTool/bin/media/detaillogo.jpg,c85
 	cp $(srcdir)/gui/media/logo.jpg !ScummTool/bin/media/logo.jpg,c85
 	cp $(srcdir)/gui/media/tile.gif !ScummTool/bin/media/tile.gif,695
 endif
+
+riscosboot:
+	mkdir -p !ScummTool/bin
+	cp ${srcdir}/dists/riscos/!Boot,feb !ScummTool/!Boot,feb
+	rm -rf !ScummTool/bin/*,ff8
+
+!ScummTool/bin/%,ff8: %$(EXEEXT)
+	$(QUIET_ELF2AIF)elf2aif $(<) !ScummTool/bin/$*,ff8
+	$(QUIET)echo "Set Alias\$$$* <ScummTool\$$Dir>.bin.$* %%*0" >> !ScummTool/!Boot,feb
diff --git a/dists/riscos/!Boot,feb b/dists/riscos/!Boot,feb
index 8477a57..0041368 100644
--- a/dists/riscos/!Boot,feb
+++ b/dists/riscos/!Boot,feb
@@ -1,13 +1,3 @@
 Set ScummTool$Dir <Obey$Dir>
 IconSprites <ScummTool$Dir>.!Sprites
 
-Set Alias$scummvm-tools-cli <ScummTool$Dir>.bin.scummvm-tools-cli %%*0
-Set Alias$construct_mohawk <ScummTool$Dir>.bin.construct_mohawk %%*0
-Set Alias$extract_mohawk <ScummTool$Dir>.bin.extract_mohawk %%*0
-Set Alias$gob_loadcalc <ScummTool$Dir>.bin.gob_loadcalc %%*0
-Set Alias$decine <ScummTool$Dir>.bin.decine %%*0
-Set Alias$degob <ScummTool$Dir>.bin.degob %%*0
-Set Alias$dekyra <ScummTool$Dir>.bin.dekyra %%*0
-Set Alias$deriven <ScummTool$Dir>.bin.deriven %%*0
-Set Alias$descumm <ScummTool$Dir>.bin.descumm %%*0
-Set Alias$desword2 <ScummTool$Dir>.bin.desword2 %%*0