diff --git a/apps/Makefile b/apps/Makefile
index 815e061d3c..7396d30372 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -128,11 +128,11 @@ $(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) $(BITMAPLIB
 	@$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS)  -L$(BUILDDIR)/firmware -L$(BUILDDIR) -lrockbox $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map
 
 $(OBJDIR)/rockbox.bin : $(OBJDIR)/rockbox.elf
-	@echo "OBJCOPY "`basename $@`
+	@echo "OBJCOPY $(notdir $@)"
 	@$(OC) -O binary $< $@
 
 $(OBJDIR)/rombox.bin : $(OBJDIR)/rombox.elf
-	@echo "OBJCOPY "`basename $@`
+	@echo "OBJCOPY $(notdir $@)"
 	@$(OC) -O binary $< $@
 
 $(OBJDIR)/rockbox.asm: $(OBJDIR)/rockbox.bin
@@ -195,7 +195,7 @@ include $(TOOLSDIR)/make.inc
 
 $(OBJDIR)/lang.o: lang/$(LANGUAGE).lang
 	@echo "GENLANG"
-	@mkdir -p `dirname $@`
+	@mkdir -p $(dir $@)
 	$(SILENT)perl -s $(TOOLSDIR)/genlang -p=$(BUILDDIR)/lang -t=$(ARCHOS) $<
 	@echo "CC lang.c"
 	@$(CC) $(CFLAGS) -c $(BUILDDIR)/lang.c -o $@
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile
index b446edf506..c3f718c954 100644
--- a/apps/plugins/Makefile
+++ b/apps/plugins/Makefile
@@ -86,7 +86,7 @@ $(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE) $(BUILDDIR)/libplugin.a $(BITMAPLIBS)
 	$(SILENT)$(CC) $(GCCOPTS) -O -nostdlib -o $@ $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,--gc-sections -Wl,-Map,$(OBJDIR)/$*.map
 
 $(OBJDIR)/%.rock : $(OBJDIR)/%.elf
-	@echo "OBJCOPY "`basename $@`
+	@echo "OBJCOPY $(notdir $@)"
 	$(SILENT)$(OC) -O binary $< $@
 else
 
@@ -95,7 +95,7 @@ ifeq ($(SIMVER), x11)
 # This is the X11 simulator version
 
 $(OBJDIR)/%.rock : $(OBJDIR)/%.o  $(BUILDDIR)/libplugin.a $(BITMAPLIBS)
-	@echo "LD "`basename $@`
+	@echo "LD $(notdir $@)"
 	$(SILENT)$(CC) $(CFLAGS) $(SHARED_FLAG) $< -L$(BUILDDIR)  $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@
 ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
 # 'x' must be kept or you'll have "Win32 error 5"
@@ -111,7 +111,7 @@ ifeq ($(SIMVER), sdl)
 # This is the SDL simulator version
 
 $(OBJDIR)/%.rock : $(OBJDIR)/%.o  $(BUILDDIR)/libplugin.a $(BITMAPLIBS)
-	@echo "LD "`basename $@`
+	@echo "LD $(notdir $@)"
 	$(SILENT)$(CC) $(CFLAGS) $(SHARED_FLAG) $< -L$(BUILDDIR)  $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@
 ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
 # 'x' must be kept or you'll have "Win32 error 5"
@@ -128,7 +128,7 @@ DLLTOOLFLAGS = --export-all
 DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
 
 $(OBJDIR)/%.rock : $(OBJDIR)/%.o  $(BUILDDIR)/libplugin.a $(BITMAPLIBS)
-	@echo "DLL "`basename $@`
+	@echo "DLL $(notdir $@)"
 	$(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $<
 	$(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libplugin.a $(BITMAPLIBS) \
                 $(patsubst -l%,$(BUILDDIR)/lib%.a,$(CODECLIBS)) -o $@
diff --git a/apps/plugins/chessbox/Makefile b/apps/plugins/chessbox/Makefile
index b79b0eae70..0389493a96 100644
--- a/apps/plugins/chessbox/Makefile
+++ b/apps/plugins/chessbox/Makefile
@@ -40,12 +40,12 @@ all: $(OUTPUT)
 
 ifndef SIMVER
 $(OBJDIR)/chessbox.elf: $(OBJS) $(LINKFILE) $(BITMAPLIBS)
-	@echo "LD "`basename $@`
+	@echo "LD $(notdir $@)"
 	@$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \
            $(LINKBITMAPS) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/chessbox.map
 
 $(OUTPUT): $(OBJDIR)/chessbox.elf
-	@echo "OBJCOPY "`basename $@`
+	@echo "OBJCOPY $(notdir $@)"
 	@$(OC) -O binary $< $@
 else
 
@@ -87,7 +87,7 @@ DLLTOOLFLAGS = --export-all
 DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
 
 $(OUTPUT): $(OBJS)
-	@echo "DLL "`basename $@`
+	@echo "DLL $(notdir $@)"
 	@$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS)
 	@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \
                 $(BUILDDIR)/libplugin.a $(BITMAPLIBS) -o $@
@@ -108,7 +108,7 @@ include $(TOOLSDIR)/make.inc
 # MEMORYSIZE should be passed on to this makefile with the chosen memory size
 # given in number of MB
 $(LINKFILE): $(LDS)
-	@echo "build "`basename $@`
+	@echo "build $(notdir $@)"
 	@cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \
 	$(DEFINES) -E -P - >$@
 
diff --git a/apps/plugins/databox/Makefile b/apps/plugins/databox/Makefile
index e47ae1e839..451f3415b4 100644
--- a/apps/plugins/databox/Makefile
+++ b/apps/plugins/databox/Makefile
@@ -31,12 +31,12 @@ all: $(OUTPUT)
 
 ifndef SIMVER
 $(OBJDIR)/databox.elf: $(OBJS) $(LINKFILE)
-	@echo "LD "`basename $@`
+	@echo "LD $(notdir $@)"
 	@$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \
            -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/databox.map
 
 $(OUTPUT): $(OBJDIR)/databox.elf
-	@echo "OBJCOPY "`basename $@`
+	@echo "OBJCOPY $(notdir $@)"
 	@$(OC) -O binary $< $@
 else
 
@@ -78,7 +78,7 @@ DLLTOOLFLAGS = --export-all
 DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
 
 $(OUTPUT): $(OBJS)
-	@echo "DLL "`basename $@`
+	@echo "DLL $(notdir $@)"
 	@$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS)
 	@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \
                 $(BUILDDIR)/libplugin.a -o $@
@@ -99,7 +99,7 @@ include $(TOOLSDIR)/make.inc
 # MEMORYSIZE should be passed on to this makefile with the chosen memory size
 # given in number of MB
 $(LINKFILE): $(LDS)
-	@echo "build "`basename $@`
+	@echo "build $(notdir $@)"
 	@cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \
 	$(DEFINES) -E -P - >$@
 
diff --git a/apps/plugins/doom/Makefile b/apps/plugins/doom/Makefile
index 678e283427..90289099df 100644
--- a/apps/plugins/doom/Makefile
+++ b/apps/plugins/doom/Makefile
@@ -3,7 +3,10 @@
 # $Id$
 #
 # $Log$
-# Revision 1.6  2006/09/29 20:04:35  barrywardell
+# Revision 1.7  2006/10/22 00:21:56  amiconn
+# Speed up build process in general by using internal functions of make instead of spawning sub-shells where possible.
+#
+# Revision 1.6  2006-09-29 20:04:35  barrywardell
 # Cleaner implementation of the recent OSX simulator build fix. No need to define SHARED_FLAG in each Makefile. Just have configure create it in the root Makefile instead.
 #
 # Revision 1.5  2006-09-29 16:15:08  barrywardell
@@ -76,12 +79,12 @@ all: $(OUTPUT)
 
 ifndef SIMVER
 $(OBJDIR)/doom.elf: $(OBJS) $(LINKFILE)
-	@echo "LD "`basename $@`
+	@echo "LD $(notdir $@)"
 	@$(CC) $(GCCOPTS) $(LDFLAGS) -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc\
            -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/doom.map
 
 $(OUTPUT): $(OBJDIR)/doom.elf
-	@echo "OBJCOPY "`basename $@`
+	@echo "OBJCOPY $(notdir $@)"
 	@$(OC) -O binary $< $@
 else
 
@@ -123,7 +126,7 @@ DLLTOOLFLAGS = --export-all
 DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
 
 $(OUTPUT): $(OBJS)
-	@echo "DLL "`basename $@`
+	@echo "DLL $(notdir $@)"
 	@$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS)
 	@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \
                 $(BUILDDIR)/libplugin.a -o $@
@@ -144,7 +147,7 @@ include $(TOOLSDIR)/make.inc
 # MEMORYSIZE should be passed on to this makefile with the chosen memory size
 # given in number of MB
 $(LINKFILE): $(LDS)
-	@echo "build "`basename $@`
+	@echo "build $(notdir $@)"
 	@cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) \
          -E -P - >$@
 
diff --git a/apps/plugins/mpegplayer/Makefile b/apps/plugins/mpegplayer/Makefile
index 215223dafa..61eae88db9 100644
--- a/apps/plugins/mpegplayer/Makefile
+++ b/apps/plugins/mpegplayer/Makefile
@@ -34,12 +34,12 @@ all: $(OUTPUT)
 
 ifndef SIMVER
 $(OBJDIR)/mpegplayer.elf: $(OBJS) $(LINKFILE)
-	@echo "LD "`basename $@`
+	@echo "LD $(notdir $@)"
 	@$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \
            -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/mpegplayer.map
 
 $(OUTPUT): $(OBJDIR)/mpegplayer.elf
-	@echo "OBJCOPY "`basename $@`
+	@echo "OBJCOPY $(notdir $@)"
 	@$(OC) -O binary $< $@
 else
 
@@ -81,7 +81,7 @@ DLLTOOLFLAGS = --export-all
 DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
 
 $(OUTPUT): $(OBJS)
-	@echo "DLL "`basename $@`
+	@echo "DLL $(notdir $@)"
 	@$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS)
 	@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \
                 $(BUILDDIR)/libplugin.a -o $@
@@ -102,7 +102,7 @@ include $(TOOLSDIR)/make.inc
 # MEMORYSIZE should be passed on to this makefile with the chosen memory size
 # given in number of MB
 $(LINKFILE): $(LDS)
-	@echo "build "`basename $@`
+	@echo "build $(notdir $@)"
 	@cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \
 	$(DEFINES) -E -P - >$@
 
diff --git a/apps/plugins/pacbox/Makefile b/apps/plugins/pacbox/Makefile
index 174d33f5bb..7af0216a4f 100644
--- a/apps/plugins/pacbox/Makefile
+++ b/apps/plugins/pacbox/Makefile
@@ -34,12 +34,12 @@ all: $(OUTPUT)
 
 ifndef SIMVER
 $(OBJDIR)/pacbox.elf: $(OBJS) $(LINKFILE)
-	@echo "LD "`basename $@`
+	@echo "LD $(notdir $@)"
 	@$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \
            -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/pacbox.map
 
 $(OUTPUT): $(OBJDIR)/pacbox.elf
-	@echo "OBJCOPY "`basename $@`
+	@echo "OBJCOPY $(notdir $@)"
 	@$(OC) -O binary $< $@
 else
 
@@ -81,7 +81,7 @@ DLLTOOLFLAGS = --export-all
 DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
 
 $(OUTPUT): $(OBJS)
-	@echo "DLL "`basename $@`
+	@echo "DLL $(notdir $@)"
 	@$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS)
 	@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \
                 $(BUILDDIR)/libplugin.a -o $@
@@ -102,7 +102,7 @@ include $(TOOLSDIR)/make.inc
 # MEMORYSIZE should be passed on to this makefile with the chosen memory size
 # given in number of MB
 $(LINKFILE): $(LDS)
-	@echo "build "`basename $@`
+	@echo "build $(notdir $@)"
 	@cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \
 	$(DEFINES) -E -P - >$@
 
diff --git a/apps/plugins/rockboy/Makefile b/apps/plugins/rockboy/Makefile
index b849c32dcf..b68229429f 100644
--- a/apps/plugins/rockboy/Makefile
+++ b/apps/plugins/rockboy/Makefile
@@ -47,12 +47,12 @@ all: $(OUTPUT)
 
 ifndef SIMVER
 $(OBJDIR)/rockboy.elf: $(OBJS) $(LINKFILE)
-	@echo "LD "`basename $@`
+	@echo "LD $(notdir $@)"
 	@$(CC) $(GCCOPTS) -O2 -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -fast -lgcc \
            -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockboy.map
 
 $(OUTPUT): $(OBJDIR)/rockboy.elf
-	@echo "OBJCOPY "`basename $@`
+	@echo "OBJCOPY $(notdir $@)"
 	@$(OC) -O binary $< $@
 else
 
@@ -94,7 +94,7 @@ DLLTOOLFLAGS = --export-all
 DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
 
 $(OUTPUT): $(OBJS)
-	@echo "DLL "`basename $@`
+	@echo "DLL $(notdir $@)"
 	@$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS)
 	@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \
                 $(BUILDDIR)/libplugin.a -o $@
@@ -115,7 +115,7 @@ include $(TOOLSDIR)/make.inc
 # MEMORYSIZE should be passed on to this makefile with the chosen memory size
 # given in number of MB
 $(LINKFILE): $(LDS)
-	@echo "build "`basename $@`
+	@echo "build $(notdir $@)"
 	@cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) \
          -E -P - >$@
 
diff --git a/apps/plugins/searchengine/Makefile b/apps/plugins/searchengine/Makefile
index bc8f19d136..7b4576802d 100644
--- a/apps/plugins/searchengine/Makefile
+++ b/apps/plugins/searchengine/Makefile
@@ -31,12 +31,12 @@ all: $(OUTPUT)
 
 ifndef SIMVER
 $(OBJDIR)/searchengine.elf: $(OBJS) $(LINKFILE)
-	@echo "LD "`basename $@`
+	@echo "LD $(notdir $@)"
 	@$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \
            -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/searchengine.map
 
 $(OUTPUT): $(OBJDIR)/searchengine.elf
-	@echo "OBJCOPY "`basename $@`
+	@echo "OBJCOPY $(notdir $@)"
 	@$(OC) -O binary $< $@
 else
 
@@ -78,7 +78,7 @@ DLLTOOLFLAGS = --export-all
 DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
 
 $(OUTPUT): $(OBJS)
-	@echo "DLL "`basename $@`
+	@echo "DLL $(notdir $@)"
 	@$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS)
 	@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \
                 $(BUILDDIR)/libplugin.a -o $@
@@ -99,7 +99,7 @@ include $(TOOLSDIR)/make.inc
 # MEMORYSIZE should be passed on to this makefile with the chosen memory size
 # given in number of MB
 $(LINKFILE): $(LDS)
-	@echo "build "`basename $@`
+	@echo "build $(notdir $@)"
 	@cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \
 	$(DEFINES) -E -P - >$@
 
diff --git a/apps/plugins/sudoku/Makefile b/apps/plugins/sudoku/Makefile
index eab09fd5b5..a59b7e5383 100644
--- a/apps/plugins/sudoku/Makefile
+++ b/apps/plugins/sudoku/Makefile
@@ -38,12 +38,12 @@ all: $(OUTPUT)
 
 ifndef SIMVER
 $(OBJDIR)/sudoku.elf: $(OBJS) $(LINKFILE) $(BITMAPLIBS)
-	@echo "LD "`basename $@`
+	@echo "LD $(notdir $@)"
 	@$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \
            $(LINKBITMAPS) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/sudoku.map
 
 $(OUTPUT): $(OBJDIR)/sudoku.elf
-	@echo "OBJCOPY "`basename $@`
+	@echo "OBJCOPY $(notdir $@)"
 	@$(OC) -O binary $< $@
 else
 
@@ -85,7 +85,7 @@ DLLTOOLFLAGS = --export-all
 DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
 
 $(OUTPUT): $(OBJS)
-	@echo "DLL "`basename $@`
+	@echo "DLL $(notdir $@)"
 	@$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS)
 	@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \
                 $(BUILDDIR)/libplugin.a $(BITMAPLIBS) -o $@
@@ -106,7 +106,7 @@ include $(TOOLSDIR)/make.inc
 # MEMORYSIZE should be passed on to this makefile with the chosen memory size
 # given in number of MB
 $(LINKFILE): $(LDS)
-	@echo "build "`basename $@`
+	@echo "build $(notdir $@)"
 	@cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \
 	$(DEFINES) -E -P - >$@
 
diff --git a/apps/plugins/zxbox/Makefile b/apps/plugins/zxbox/Makefile
index 055bf6e967..14234cd896 100644
--- a/apps/plugins/zxbox/Makefile
+++ b/apps/plugins/zxbox/Makefile
@@ -43,12 +43,12 @@ all: $(OUTPUT)
 
 ifndef SIMVER
 $(OBJDIR)/zxbox.elf: $(OBJS) $(LINKFILE)
-	@echo "LD "`basename $@`
+	@echo "LD $(notdir $@)"
 	@$(CC) $(GCCOPTS) -O -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -lplugin -lgcc \
            -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/zxbox.map
 
 $(OUTPUT): $(OBJDIR)/zxbox.elf
-	@echo "OBJCOPY "`basename $@`
+	@echo "OBJCOPY $(notdir $@)"
 	@$(OC) -O binary $< $@
 else
 
@@ -76,7 +76,7 @@ include $(TOOLSDIR)/make.inc
 # MEMORYSIZE should be passed on to this makefile with the chosen memory size
 # given in number of MB
 $(LINKFILE): $(LDS)
-	@echo "build "`basename $@`
+	@echo "build $(notdir $@)"
 	@cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) \
 	$(DEFINES) -E -P - >$@
 
diff --git a/firmware/decompressor/Makefile b/firmware/decompressor/Makefile
index a1f7c410e0..357b855c41 100644
--- a/firmware/decompressor/Makefile
+++ b/firmware/decompressor/Makefile
@@ -19,11 +19,11 @@ CFLAGS = $(GCCOPTS)
 all: $(OBJDIR)/compressed.bin
 
 $(OBJDIR)/compressed.bin : $(OBJDIR)/compressed.elf
-	@echo "OBJCOPY "`basename $@`
+	@echo "OBJCOPY $(notdir $@)"
 	$(SILENT)$(OC) -O binary $< $@
 
 $(OBJDIR)/compressed.elf : $(OBJS) $(LINKFILE)
-	@echo "LD `basename $@`"
+	@echo "LD $(notdir $@)"
 	$(SILENT)$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/compressed.map
 
 $(LDS): $(OBJS)
@@ -34,22 +34,22 @@ $(LINKFILE): $(LDS)
 	$(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@
 
 $(OBJDIR)/decompressor.o : decompressor.c $(OBJDIR)/uclimage.c
-	$(SILENT)mkdir -p `dirname $@`
+	$(SILENT)mkdir -p $(dir $@)
 	@echo "CC $<"
 	$(SILENT)$(CC) $(CFLAGS) -I$(OBJDIR) -c $< -o $@
 
 $(OBJDIR)/startup.o : startup.S
-	$(SILENT)mkdir -p `dirname $@`
+	$(SILENT)mkdir -p $(dir $@)
 	@echo "AS $<"
 	$(SILENT)$(CC) $(CFLAGS) -c $< -o $@
 
 $(OBJDIR)/uclimage.o : $(OBJDIR)/uclimage.c
-	$(SILENT)mkdir -p `dirname $@`
-	@echo "CC `basename $<`"
+	$(SILENT)mkdir -p $(dir $@)
+	@echo "CC $(notdir $<)"
 	$(SILENT)$(CC) $(CFLAGS) -c $< -o $@
 
 $(OBJDIR)/uclimage.c : $(FLASHFILE)  $(TOOLSDIR)/ucl2src.pl
-	$(SILENT)mkdir -p `dirname $@`
+	$(SILENT)mkdir -p $(dir $@)
 	@echo "UCL2SRC"
 	$(SILENT)perl -s $(TOOLSDIR)/ucl2src.pl -p=$(OBJDIR)/uclimage $<
 
diff --git a/tools/make.inc b/tools/make.inc
index 344fa23543..e2430a2b6b 100644
--- a/tools/make.inc
+++ b/tools/make.inc
@@ -5,12 +5,12 @@ SILENT=@
 endif
 
 $(OBJDIR)/%.o: %.c
-	$(SILENT)mkdir -p `dirname $@`
+	$(SILENT)mkdir -p $(dir $@)
 	@echo "CC $<"
 	$(SILENT)$(CC) $(CFLAGS) -c $< -o $@
 
 $(OBJDIR)/%.o: %.S
-	$(SILENT)mkdir -p `dirname $@`
+	$(SILENT)mkdir -p $(dir $@)
 	@echo "CC $<"
 	$(SILENT)$(CC) $(CFLAGS) -c $< -o $@
 
@@ -26,7 +26,7 @@ $(OBJDIR)/%.o: %.S
 # without the proper path.
 #
 $(DEPFILE): $(SOURCES)
-	$(SILENT)mkdir -p `dirname $(DEPFILE)`
+	$(SILENT)mkdir -p $(dir $(DEPFILE))
 	$(SILENT)rm -f $(DEPFILE)
 	$(SILENT)(for each in $(SOURCES) x; do \
 	    if test "$$each" = "credits.c"; then \
diff --git a/tools/makebmp.inc b/tools/makebmp.inc
index e12a52b3eb..d276732b67 100644
--- a/tools/makebmp.inc
+++ b/tools/makebmp.inc
@@ -7,18 +7,18 @@ SILENT=@
 endif
 
 $(OBJDIR)/%.c: %.bmp
-	$(SILENT)mkdir -p `dirname $@`
+	$(SILENT)mkdir -p $(dir $@)
 	$(SILENT)mkdir -p $(BMPINCDIR)
 	@echo BMP2RB $<
 	$(SILENT)$(BMP2RB) -h $(BMPINCDIR) $< > $@
 
 $(OBJDIR)/%.o: $(OBJDIR)/%.c
-	$(SILENT)mkdir -p `dirname $@`
-	@echo CC `basename $<`
+	$(SILENT)mkdir -p $(dir $@)
+	@echo CC $(notdir $<)
 	$(SILENT)$(CC) $(CFLAGS) -c $< -o $@
 
 $(DEPFILE): SOURCES
-	$(SILENT)mkdir -p `dirname $(DEPFILE)`
+	$(SILENT)mkdir -p $(dir $(DEPFILE))
 	$(SILENT)rm -f $(DEPFILE)
 	$(SILENT)(for each in $(SOURCES) x; do \
           if test "x" != "$$each"; then \