summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2006-10-30 01:40:20 +0000
committerJens Arnold <amiconn@rockbox.org>2006-10-30 01:40:20 +0000
commitf40f0debcbada2ef635872b9c4d352b7416bf721 (patch)
treef7c6aabd42e602f0e33f2389fbf752c6abab0f7e
parent5421e8696906cda6416d089d5f387bb38a147ee2 (diff)
downloadrockbox-f40f0debcbada2ef635872b9c4d352b7416bf721.tar.gz
rockbox-f40f0debcbada2ef635872b9c4d352b7416bf721.zip
Adapted more Makefiles to the more efficient info printing.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11390 a1c6a512-1295-4272-9138-f99709370657
Diffstat
-rw-r--r--apps/codecs/libwavpack/Makefile8
-rw-r--r--bootloader/Makefile23
-rw-r--r--flash/bootbox/Makefile26
-rw-r--r--gdb/Makefile15
4 files changed, 27 insertions, 45 deletions
diff --git a/apps/codecs/libwavpack/Makefile b/apps/codecs/libwavpack/Makefile
index 077e4aa94e..7afc9e1042 100644
--- a/apps/codecs/libwavpack/Makefile
+++ b/apps/codecs/libwavpack/Makefile
@@ -30,15 +30,13 @@ DIRS =
30all: $(OUTPUT) 30all: $(OUTPUT)
31 31
32$(OUTPUT): $(OBJS) 32$(OUTPUT): $(OBJS)
33 @echo "AR+RANLIB $(notdir $@)" 33 $(call PRINTS,AR+RANLIB $(@F))$(AR) ruv $@ $+ >/dev/null 2>&1
34 @$(AR) ruv $@ $+ >/dev/null 2>&1 34 $(SILENT)$(RANLIB) $@
35 @$(RANLIB) $@
36 35
37include $(TOOLSDIR)/make.inc 36include $(TOOLSDIR)/make.inc
38 37
39clean: 38clean:
40 @echo "cleaning libwavpack" 39 $(call PRINTS,cleaning libwavpack)rm -f $(OBJS) $(OUTPUT) $(DEPFILE)
41 @rm -f $(OBJS) $(OUTPUT) $(DEPFILE)
42 40
43ifneq ($(MAKECMDGOALS),clean) 41ifneq ($(MAKECMDGOALS),clean)
44-include $(DEPFILE) 42-include $(DEPFILE)
diff --git a/bootloader/Makefile b/bootloader/Makefile
index 46a056ceb2..134187d521 100644
--- a/bootloader/Makefile
+++ b/bootloader/Makefile
@@ -50,35 +50,30 @@ endif
50dep: $(DEPFILE) 50dep: $(DEPFILE)
51 51
52$(LINKFILE): $(LDS) 52$(LINKFILE): $(LDS)
53 @echo "Build LDS file" 53 $(call PRINTS,Build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@
54 @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@
55 54
56$(MAXOUTFILE): 55$(MAXOUTFILE):
57 @echo '#include "config.h"' > $(MAXINFILE) 56 $(SILENT)echo '#include "config.h"' > $(MAXINFILE)
58 @echo "ROM_START" >> $(MAXINFILE) 57 $(SILENT)echo "ROM_START" >> $(MAXINFILE)
59 @cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE) 58 $(SILENT)cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE)
60 @rm $(MAXINFILE) 59 $(SILENT)rm $(MAXINFILE)
61 60
62$(OBJDIR)/bootloader.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) 61$(OBJDIR)/bootloader.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX)
63 @echo "LD bootloader.elf" 62 $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -L$(BUILDDIR)/firmware -lrockbox -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/bootloader.map
64 $(SILENT)$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -L$(BUILDDIR)/firmware -lrockbox -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/bootloader.map
65 63
66$(OBJDIR)/bootloader.bin : $(OBJDIR)/bootloader.elf 64$(OBJDIR)/bootloader.bin : $(OBJDIR)/bootloader.elf
67 @echo "OBJCOPY $<" 65 $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@
68 $(SILENT)$(OC) -O binary $< $@
69 66
70$(OBJDIR)/bootloader.asm: $(OBJDIR)/bootloader.bin 67$(OBJDIR)/bootloader.asm: $(OBJDIR)/bootloader.bin
71 $(TOOLSDIR)/sh2d -sh1 $< > $@ 68 $(TOOLSDIR)/sh2d -sh1 $< > $@
72 69
73$(BUILDDIR)/$(BINARY) : $(OBJDIR)/bootloader.bin 70$(BUILDDIR)/$(BINARY) : $(OBJDIR)/bootloader.bin
74 @echo "Build bootloader file" 71 $(call PRINTS,Build bootloader file)$(MKFIRMWARE) $< $@
75 $(SILENT)$(MKFIRMWARE) $< $@
76 72
77include $(TOOLSDIR)/make.inc 73include $(TOOLSDIR)/make.inc
78 74
79clean: 75clean:
80 @echo "cleaning bootloader" 76 $(call PRINTS,cleaning bootloader)-rm -f $(OBJS) $(BUILDDIR)/$(BINARY) $(OBJDIR)/bootloader.asm \
81 @-rm -f $(OBJS) $(BUILDDIR)/$(BINARY) $(OBJDIR)/bootloader.asm \
82 $(OBJDIR)/bootloader.bin $(OBJDIR)/bootloader.elf $(OBJDIR)/*.map \ 77 $(OBJDIR)/bootloader.bin $(OBJDIR)/bootloader.elf $(OBJDIR)/*.map \
83 $(LINKFILE) $(MAXOUTFILE) $(DEPFILE) 78 $(LINKFILE) $(MAXOUTFILE) $(DEPFILE)
84 79
diff --git a/flash/bootbox/Makefile b/flash/bootbox/Makefile
index 7a58749c07..7391f3c4fe 100644
--- a/flash/bootbox/Makefile
+++ b/flash/bootbox/Makefile
@@ -42,39 +42,33 @@ all: $(BUILDDIR)/$(BINARY) $(FLASHFILE)
42dep: $(DEPFILE) 42dep: $(DEPFILE)
43 43
44$(LINKFILE): $(LDS) 44$(LINKFILE): $(LDS)
45 @echo "Build LDS file" 45 $(call PRINTS,Build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@
46 @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@
47 46
48$(MAXOUTFILE): 47$(MAXOUTFILE):
49 @echo '#include "config.h"' > $(MAXINFILE) 48 $(SILENT)echo '#include "config.h"' > $(MAXINFILE)
50 @echo "ROM_START" >> $(MAXINFILE) 49 $(SILENT)echo "ROM_START" >> $(MAXINFILE)
51 @cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE) 50 $(SILENT)cat $(MAXINFILE) | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - > $(MAXOUTFILE)
52 @rm $(MAXINFILE) 51 $(SILENT)rm $(MAXINFILE)
53 52
54$(OBJDIR)/bootbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) 53$(OBJDIR)/bootbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX)
55 @echo "LD bootbox.elf" 54 $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Wl,--gc-sections -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -L$(BUILDDIR)/firmware -lrockbox -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/bootbox.map
56 $(CC) $(GCCOPTS) -Wl,--gc-sections -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -L$(BUILDDIR)/firmware -lrockbox -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/bootbox.map
57 55
58$(OBJDIR)/bootbox.bin : $(OBJDIR)/bootbox.elf 56$(OBJDIR)/bootbox.bin : $(OBJDIR)/bootbox.elf
59 @echo "OBJCOPY $<" 57 $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@
60 @$(OC) -O binary $< $@
61 58
62$(OBJDIR)/bootbox.asm: $(OBJDIR)/bootbox.bin 59$(OBJDIR)/bootbox.asm: $(OBJDIR)/bootbox.bin
63 $(TOOLSDIR)/sh2d -sh1 $< > $@ 60 $(TOOLSDIR)/sh2d -sh1 $< > $@
64 61
65$(BUILDDIR)/$(BINARY) : $(OBJDIR)/bootbox.bin 62$(BUILDDIR)/$(BINARY) : $(OBJDIR)/bootbox.bin
66 @echo "Build bootbox file" 63 $(call PRINTS,Build bootbox file)$(MKFIRMWARE) $< $@
67 @$(MKFIRMWARE) $< $@
68 64
69$(FLASHFILE): $(OBJDIR)/bootbox.bin 65$(FLASHFILE): $(OBJDIR)/bootbox.bin
70 $(SILENT)(echo "UCLPACK bootbox" ; \ 66 $(call PRINTS,UCLPACK bootbox)$(TOOLSDIR)/uclpack --best --2e $< $@ >/dev/null 2>&1;
71 $(TOOLSDIR)/uclpack --best --2e $< $@ >/dev/null 2>&1;)
72 67
73include $(TOOLSDIR)/make.inc 68include $(TOOLSDIR)/make.inc
74 69
75clean: 70clean:
76 @echo "cleaning bootbox" 71 $(call PRINTS,cleaning bootbox)-rm -f $(OBJS) $(BUILDDIR)/$(BINARY) $(OBJDIR)/bootbox.asm $(OBJDIR)/rockbox.ucl \
77 @-rm -f $(OBJS) $(BUILDDIR)/$(BINARY) $(OBJDIR)/bootbox.asm $(OBJDIR)/rockbox.ucl \
78 $(OBJDIR)/bootbox.bin $(OBJDIR)/bootbox.elf $(OBJDIR)/*.map \ 72 $(OBJDIR)/bootbox.bin $(OBJDIR)/bootbox.elf $(OBJDIR)/*.map \
79 $(LINKFILE) $(MAXOUTFILE) $(DEPFILE) $(FLASHFILE) 73 $(LINKFILE) $(MAXOUTFILE) $(DEPFILE) $(FLASHFILE)
80 74
diff --git a/gdb/Makefile b/gdb/Makefile
index fa94eac9b1..0850767f58 100644
--- a/gdb/Makefile
+++ b/gdb/Makefile
@@ -41,26 +41,21 @@ all: $(BUILDDIR)/$(BINARY) $(FLASHFILE)
41dep: $(DEPFILE) 41dep: $(DEPFILE)
42 42
43$(LINKFILE): $(LDS) 43$(LINKFILE): $(LDS)
44 @echo "Build LDS file" 44 $(call PRINTS,Build $(@F))cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@
45 @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P $(ROMBUILD) - >$@
46 45
47$(OBJDIR)/stub.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) 46$(OBJDIR)/stub.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX)
48 @echo "LD stub.elf" 47 $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -L$(BUILDDIR)/firmware -lrockbox -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/stub.map
49 @$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR) -L$(BUILDDIR)/firmware -lrockbox -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/stub.map
50 48
51$(OBJDIR)/stub.bin : $(OBJDIR)/stub.elf 49$(OBJDIR)/stub.bin : $(OBJDIR)/stub.elf
52 @echo "OBJCOPY $<" 50 $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@
53 @$(OC) -O binary $< $@
54 51
55$(BUILDDIR)/$(BINARY) : $(OBJDIR)/stub.bin 52$(BUILDDIR)/$(BINARY) : $(OBJDIR)/stub.bin
56 @echo "Build stub file" 53 $(call PRINTS,Build stub file)$(MKFIRMWARE) $< $@
57 $(MKFIRMWARE) $< $@
58 54
59include $(TOOLSDIR)/make.inc 55include $(TOOLSDIR)/make.inc
60 56
61clean: 57clean:
62 @echo "cleaning stub" 58 $(call PRINTS,cleaning stub)-rm -f $(OBJS) $(BUILDDIR)/$(BINARY) \
63 @-rm -f $(OBJS) $(BUILDDIR)/$(BINARY) \
64 $(OBJDIR)/stub.bin $(OBJDIR)/stub.elf $(OBJDIR)/*.map \ 59 $(OBJDIR)/stub.bin $(OBJDIR)/stub.elf $(OBJDIR)/*.map \
65 $(LINKFILE) $(DEPFILE) 60 $(LINKFILE) $(DEPFILE)
66 61
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-17 22:37:16 +0000