Index: tools/configure =================================================================== --- tools/configure (revision 16346) +++ tools/configure (working copy) @@ -1925,26 +1925,26 @@ export ENCODER=@ENCODER@ # Do not print "Entering directory ..." MAKEFLAGS += --no-print-directory -.PHONY: all clean tags zip tools manual bin build info langs +.PHONY: all clean tags zip tools manual bin build info @LANGS@ @TOOLSET@ all: info info: build \$(SILENT)\$(TOOLSDIR)/mkinfo.pl \$(BUILDDIR)/rockbox-info.txt -build: tools @LANGS@ +build: @TOOLSET@ @LANGS@ @SIMUL1@ @SIMUL2@ \$(SILENT)\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware \$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ -bin: tools +bin: @TOOLSET@ @SIMUL1@ @SIMUL2@ \$(SILENT)\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware \$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ \$(BUILDDIR)/\$(BINARY) -rocks: tools +rocks: @TOOLSET@ \$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ rocks veryclean: clean toolsclean @@ -1960,8 +1960,7 @@ clean: html txt rockbox-manual*.zip sysfont.h rockbox-info.txt \ voicefontids *.wav *.mp3 *.voice max_language_size.h -tools: - \$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) AR=\$(HOSTAR) @TOOLSET@ +tools: @TOOLSET@ voicetools: \$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) AR=\$(HOSTAR) @VOICETOOLSET@ @@ -2047,6 +2046,15 @@ help: EOF +for i in $toolset; do + cat >> Makefile <> Makefile <