diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/Makefile | 21 | ||||
-rwxr-xr-x | tools/configure | 34 | ||||
-rw-r--r-- | tools/make.inc | 34 |
3 files changed, 45 insertions, 44 deletions
diff --git a/tools/Makefile b/tools/Makefile index 89c3681cc9..bd253e7584 100644 --- a/tools/Makefile +++ b/tools/Makefile | |||
@@ -27,30 +27,31 @@ iaudio.o: iaudio.c | |||
27 | sh2d: sh2d.c | 27 | sh2d: sh2d.c |
28 | 28 | ||
29 | bmp2rb: bmp2rb.c | 29 | bmp2rb: bmp2rb.c |
30 | $(CC) -DAPPLICATION_NAME=\"$@\" -g $+ -o $@ | 30 | $(SILENT)$(CC) -DAPPLICATION_NAME=\"$@\" -g $+ -o $@ |
31 | 31 | ||
32 | rdf2binary: rdf2binary.c | 32 | rdf2binary: rdf2binary.c |
33 | $(CC) -g $+ -o $@ | 33 | $(SILENT)$(CC) -g $+ -o $@ |
34 | 34 | ||
35 | mkboot: mkboot.c | 35 | mkboot: mkboot.c |
36 | $(CC) -g $+ -o $@ | 36 | $(SILENT)$(CC) -g $+ -o $@ |
37 | 37 | ||
38 | ipod_fw: ipod_fw.c | 38 | ipod_fw: ipod_fw.c |
39 | $(CC) -g $+ -o $@ | 39 | $(SILENT)$(CC) -g $+ -o $@ |
40 | 40 | ||
41 | convbdf: convbdf.c | 41 | convbdf: convbdf.c |
42 | $(CC) -g $+ -o $@ | 42 | $(SILENT)$(CC) -g $+ -o $@ |
43 | 43 | ||
44 | codepages: codepages.c codepage_tables.c | 44 | codepages: codepages.c codepage_tables.c |
45 | $(CC) -g $+ -o $@ | 45 | $(SILENT)$(CC) -g $+ -o $@ |
46 | 46 | ||
47 | generate_rocklatin: generate_rocklatin.c ../firmware/drivers/lcd-player-charset.c | 47 | generate_rocklatin: generate_rocklatin.c ../firmware/drivers/lcd-player-charset.c |
48 | $(CC) -DHAVE_LCD_CHARCELLS -D__CONFIG_H__ -I../firmware/export $+ -o $@ | 48 | $(SILENT)$(CC) -DHAVE_LCD_CHARCELLS -D__CONFIG_H__ -I../firmware/export $+ -o $@ |
49 | 49 | ||
50 | uclpack: | 50 | uclpack: |
51 | $(MAKE) -C ucl | 51 | $(SILENT)$(MAKE) -C ucl |
52 | 52 | ||
53 | clean: | 53 | clean: |
54 | rm -f $(CLEANALL) $(shell for f in $(CLEANALL) ; do echo $$f.exe $$f.o $$f.obj ; done) *.ajf *~ | 54 | @echo "Cleaning tools" |
55 | $(MAKE) -C ucl clean | 55 | $(SILENT)rm -f $(CLEANALL) $(shell for f in $(CLEANALL) ; do echo $$f.exe $$f.o $$f.obj ; done) *.ajf *~ |
56 | $(SILENT)$(MAKE) -C ucl clean | ||
56 | 57 | ||
diff --git a/tools/configure b/tools/configure index a50abb8d1d..ddfea63cb3 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -1073,6 +1073,10 @@ sed > Makefile \ | |||
1073 | <<EOF | 1073 | <<EOF |
1074 | ## Automaticly generated. http://www.rockbox.org/ | 1074 | ## Automaticly generated. http://www.rockbox.org/ |
1075 | 1075 | ||
1076 | ifndef V | ||
1077 | SILENT=@ | ||
1078 | endif | ||
1079 | |||
1076 | export ROOTDIR=@ROOTDIR@ | 1080 | export ROOTDIR=@ROOTDIR@ |
1077 | export FIRMDIR=@FIRMDIR@ | 1081 | export FIRMDIR=@FIRMDIR@ |
1078 | export APPSDIR=@APPSDIR@ | 1082 | export APPSDIR=@APPSDIR@ |
@@ -1129,33 +1133,33 @@ MAKEFLAGS += --no-print-directory | |||
1129 | all: tools | 1133 | all: tools |
1130 | @SIMUL1@ | 1134 | @SIMUL1@ |
1131 | @SIMUL2@ | 1135 | @SIMUL2@ |
1132 | @\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware | 1136 | \$(SILENT)\$(MAKE) -C \$(FIRMDIR) OBJDIR=\$(BUILDDIR)/firmware |
1133 | @\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ | 1137 | \$(SILENT)\$(MAKE) -C \$(APPSDIR) OBJDIR=\$(BUILDDIR)/@APPS@ |
1134 | 1138 | ||
1135 | clean: | 1139 | clean: |
1136 | @\$(MAKE) -C \$(FIRMDIR) clean OBJDIR=\$(BUILDDIR)/firmware | 1140 | \$(SILENT)\$(MAKE) -C \$(FIRMDIR) clean OBJDIR=\$(BUILDDIR)/firmware |
1137 | @\$(MAKE) -C \$(APPSDIR) clean OBJDIR=\$(BUILDDIR)/@APPS@ | 1141 | \$(SILENT)\$(MAKE) -C \$(APPSDIR) clean OBJDIR=\$(BUILDDIR)/@APPS@ |
1138 | @\$(MAKE) -C \$(TOOLSDIR) clean | 1142 | \$(SILENT)\$(MAKE) -C \$(TOOLSDIR) clean |
1139 | @rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim lang.h manual *.pdf | 1143 | \$(SILENT)rm -rf rockbox.zip TAGS @APPS@ firmware comsim sim lang.h manual *.pdf |
1140 | 1144 | ||
1141 | tools: | 1145 | tools: |
1142 | \$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) @TOOLSET@ | 1146 | \$(SILENT)\$(MAKE) -C \$(TOOLSDIR) CC=\$(HOSTCC) @TOOLSET@ |
1143 | 1147 | ||
1144 | tags: | 1148 | tags: |
1145 | @rm -f TAGS | 1149 | \$(SILENT)rm -f TAGS |
1146 | \$(MAKE) -C \$(FIRMDIR) tags | 1150 | \$(SILENT)\$(MAKE) -C \$(FIRMDIR) tags |
1147 | \$(MAKE) -C \$(APPSDIR) tags | 1151 | \$(SILENT)\$(MAKE) -C \$(APPSDIR) tags |
1148 | \$(MAKE) -C \$(APPSDIR)/plugins tags | 1152 | \$(SILENT)\$(MAKE) -C \$(APPSDIR)/plugins tags |
1149 | \$(MAKE) -C \$(APPSDIR)/plugins/lib tags | 1153 | \$(SILENT)\$(MAKE) -C \$(APPSDIR)/plugins/lib tags |
1150 | 1154 | ||
1151 | zip: | 1155 | zip: |
1152 | @\$(TOOLSDIR)/buildzip.pl -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY) | 1156 | \$(SILENT)\$(TOOLSDIR)/buildzip.pl -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY) |
1153 | 1157 | ||
1154 | 7zip: | 1158 | 7zip: |
1155 | @\$(TOOLSDIR)/buildzip.pl -o "rockbox.7z" -z "7za a" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY) | 1159 | \$(SILENT)\$(TOOLSDIR)/buildzip.pl -o "rockbox.7z" -z "7za a" -r "\$(ROOTDIR)" \$(TARGET) \$(BINARY) |
1156 | 1160 | ||
1157 | manual: | 1161 | manual: |
1158 | @\$(MAKE) -C \$(MANUALDIR) OBJDIR=\$(BUILDDIR)/manual buildmanual | 1162 | \$(SILENT)\$(MAKE) -C \$(MANUALDIR) OBJDIR=\$(BUILDDIR)/manual buildmanual |
1159 | 1163 | ||
1160 | EOF | 1164 | EOF |
1161 | 1165 | ||
diff --git a/tools/make.inc b/tools/make.inc index 5a2ed800a6..344fa23543 100644 --- a/tools/make.inc +++ b/tools/make.inc | |||
@@ -28,25 +28,21 @@ $(OBJDIR)/%.o: %.S | |||
28 | $(DEPFILE): $(SOURCES) | 28 | $(DEPFILE): $(SOURCES) |
29 | $(SILENT)mkdir -p `dirname $(DEPFILE)` | 29 | $(SILENT)mkdir -p `dirname $(DEPFILE)` |
30 | $(SILENT)rm -f $(DEPFILE) | 30 | $(SILENT)rm -f $(DEPFILE) |
31 | $(SILENT)(if test ! -f $(BUILDDIR)/lang.h; then \ | 31 | $(SILENT)(for each in $(SOURCES) x; do \ |
32 | del="$(BUILDDIR)/lang.h"; \ | 32 | if test "$$each" = "credits.c"; then \ |
33 | touch $(BUILDDIR)/lang.h; \ | 33 | del="$$del$(BUILDDIR)/credits.raw"; \ |
34 | fi; \ | 34 | touch $(BUILDDIR)/credits.raw; \ |
35 | for each in $(SOURCES) x; do \ | 35 | fi; \ |
36 | if test "$$each" = "credits.c"; then \ | 36 | if test "x" != "$$each"; then \ |
37 | del="$$del$(BUILDDIR)/credits.raw"; \ | 37 | obj=`echo $$each | sed -e 's/\.[cS]/.o/'`; \ |
38 | touch $(BUILDDIR)/credits.raw; \ | 38 | $(CC) -MG -MM -MT "$(OBJDIR)/$$obj" $(CFLAGS) $$each 2>/dev/null; \ |
39 | fi; \ | 39 | fi; \ |
40 | if test "x" != "$$each"; then \ | 40 | if test -n "$$del"; then \ |
41 | obj=`echo $$each | sed -e 's/\.[cS]/.o/'`; \ | 41 | rm $$del; \ |
42 | $(CC) -MM -MT "$(OBJDIR)/$$obj" $(CFLAGS) $$each >> $(DEPFILE) 2>/dev/null; \ | 42 | del=""; \ |
43 | fi; \ | 43 | fi \ |
44 | if test -n "$$del"; then \ | 44 | done | sed -e "s:[^[:space:]]*lang.h:$(OBJDIR)/lang.o:" > $(DEPFILE); \ |
45 | rm $$del; \ | 45 | echo "oo" > /dev/null ) |
46 | del=""; \ | ||
47 | fi \ | ||
48 | done; \ | ||
49 | echo "oo" >/dev/null ) | ||
50 | 46 | ||
51 | tags: | 47 | tags: |
52 | $(SILENT)(for d in $(DIRS); do \ | 48 | $(SILENT)(for d in $(DIRS); do \ |