diff options
author | Jens Arnold <amiconn@rockbox.org> | 2006-10-27 21:48:06 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2006-10-27 21:48:06 +0000 |
commit | a796260a6b9929f6aca844b4a788a2f55ef60d4b (patch) | |
tree | 21d3f983c2e618806cf6f160c67f7efd053061f0 /firmware | |
parent | 354770088e87c3aa8720f462fe3ac8368d7de5b5 (diff) | |
download | rockbox-a796260a6b9929f6aca844b4a788a2f55ef60d4b.tar.gz rockbox-a796260a6b9929f6aca844b4a788a2f55ef60d4b.zip |
Next step of Makefile tuning: * Use 'make' internal commands for printing messages. Saves build time especially on cygwin. * SILENT variable used in more places. * Bitmap build system uses one Makefille less.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11369 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/Makefile | 15 | ||||
-rw-r--r-- | firmware/decompressor/Makefile | 22 |
2 files changed, 13 insertions, 24 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index 9259f8cc29..dea4c81b33 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -27,26 +27,21 @@ all: $(OUTPUT) $(EXTRA_TARGETS) dep: $(DEPFILE) $(OUTPUT): $(OBJS) $(DEPFILE) - @echo "AR+RANLIB $(notdir $@)" - $(SILENT)$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 + $(call PRINTS,AR+RANLIB $(@F))$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 $(SILENT)$(RANLIB) $@ include $(TOOLSDIR)/make.inc clean: - @echo "cleaning firmware" - $(SILENT)rm -f $(OBJS) $(OUTPUT) $(OBJDIR)/sysfont.c $(DEPFILE) + $(call PRINTS,cleaning firmware)rm -f $(OBJS) $(OUTPUT) $(OBJDIR)/sysfont.c $(DEPFILE) $(SILENT)rm -rf $(OBJDIR)/drivers $(OBJDIR)/common # Special targets $(OBJDIR)/thread.o: thread.c export/thread.h - $(SILENT)echo "CC thread.c" - $(SILENT)$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@ + $(call PRINTS,CC thread.c)$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@ $(OBJDIR)/sysfont.o: ../fonts/rockbox_default.bdf - @echo "CONVBDF" - $(SILENT)$(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $< - @echo "CC sysfont.c" - $(SILENT)$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@ + $(call PRINTS,CONVBDF)$(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $< + $(call PRINTS,CC sysfont.c)$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@ -include $(DEPFILE) diff --git a/firmware/decompressor/Makefile b/firmware/decompressor/Makefile index 357b855c41..17ccf6da77 100644 --- a/firmware/decompressor/Makefile +++ b/firmware/decompressor/Makefile @@ -10,6 +10,7 @@ ifndef V SILENT=@ endif +PRINTS=$(info $(1))$(SILENT) LDS := link.lds LINKFILE = $(OBJDIR)/linkage.lds @@ -19,37 +20,30 @@ CFLAGS = $(GCCOPTS) all: $(OBJDIR)/compressed.bin $(OBJDIR)/compressed.bin : $(OBJDIR)/compressed.elf - @echo "OBJCOPY $(notdir $@)" - $(SILENT)$(OC) -O binary $< $@ + $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ $(OBJDIR)/compressed.elf : $(OBJS) $(LINKFILE) - @echo "LD $(notdir $@)" - $(SILENT)$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/compressed.map + $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/compressed.map $(LDS): $(OBJS) $(LINKFILE): $(LDS) - @echo "Build LDS file" - $(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@ + $(call PRINTS,Build LDS file)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@ $(OBJDIR)/decompressor.o : decompressor.c $(OBJDIR)/uclimage.c $(SILENT)mkdir -p $(dir $@) - @echo "CC $<" - $(SILENT)$(CC) $(CFLAGS) -I$(OBJDIR) -c $< -o $@ + $(call PRINTS,CC $<)$(CC) $(CFLAGS) -I$(OBJDIR) -c $< -o $@ $(OBJDIR)/startup.o : startup.S $(SILENT)mkdir -p $(dir $@) - @echo "AS $<" - $(SILENT)$(CC) $(CFLAGS) -c $< -o $@ + $(call PRINTS,AS $<)$(CC) $(CFLAGS) -c $< -o $@ $(OBJDIR)/uclimage.o : $(OBJDIR)/uclimage.c $(SILENT)mkdir -p $(dir $@) - @echo "CC $(notdir $<)" - $(SILENT)$(CC) $(CFLAGS) -c $< -o $@ + $(call PRINTS,CC $(<F))$(CC) $(CFLAGS) -c $< -o $@ $(OBJDIR)/uclimage.c : $(FLASHFILE) $(TOOLSDIR)/ucl2src.pl $(SILENT)mkdir -p $(dir $@) - @echo "UCL2SRC" - $(SILENT)perl -s $(TOOLSDIR)/ucl2src.pl -p=$(OBJDIR)/uclimage $< + $(call PRINTS,UCL2SRC)perl -s $(TOOLSDIR)/ucl2src.pl -p=$(OBJDIR)/uclimage $< |