diff options
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/configure | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/configure b/tools/configure index a6633befd9..1e0a102734 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -437,7 +437,12 @@ appsdir='\$(ROOTDIR)/apps' | |||
437 | 437 | ||
438 | # toolset is the tools within the tools directory that we build for | 438 | # toolset is the tools within the tools directory that we build for |
439 | # this particular target. | 439 | # this particular target. |
440 | toolset="$toolset scramble descramble sh2d generate_rocklatin uclpack" | 440 | toolset="$toolset scramble descramble sh2d generate_rocklatin uclpack convbdf" |
441 | |||
442 | # Note: the convbdf is present in the toolset just because: 1) the | ||
443 | # firmware/Makefile assumes it is present always, and 2) we will need it when we | ||
444 | # build the player simulator | ||
445 | |||
441 | ;; | 446 | ;; |
442 | 447 | ||
443 | 2) | 448 | 2) |
@@ -841,11 +846,9 @@ if test "$simulator" = "yes"; then | |||
841 | 846 | ||
842 | # add simul make stuff on the #SIMUL# line | 847 | # add simul make stuff on the #SIMUL# line |
843 | simmagic='/#SIMUL#/c\ @$(MAKE) -C $(SIMDIR) OBJDIR=$(BUILDDIR)/sim\n @$(MAKE) -C $(ROOTDIR)/uisimulator/common OBJDIR=$(BUILDDIR)/comsim' | 848 | simmagic='/#SIMUL#/c\ @$(MAKE) -C $(SIMDIR) OBJDIR=$(BUILDDIR)/sim\n @$(MAKE) -C $(ROOTDIR)/uisimulator/common OBJDIR=$(BUILDDIR)/comsim' |
844 | simtools='s/#TOOLSDEP#//' | ||
845 | else | 849 | else |
846 | # delete the line that matches | 850 | # delete the line that matches |
847 | simmagic='/#SIMUL#/D' | 851 | simmagic='/#SIMUL#/D' |
848 | simtools='s/#TOOLSDEP#/tools/' | ||
849 | fi | 852 | fi |
850 | 853 | ||
851 | sed > Makefile \ | 854 | sed > Makefile \ |
@@ -935,7 +938,7 @@ MAKEFLAGS += --no-print-directory | |||
935 | 938 | ||
936 | .PHONY: all clean tags zip tools | 939 | .PHONY: all clean tags zip tools |
937 | 940 | ||
938 | all: #TOOLSDEP# | 941 | all: tools |
939 | #SIMUL# | 942 | #SIMUL# |
940 | @\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware | 943 | @\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware |
941 | @\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ | 944 | @\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ |