diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/Makefile | 8 | ||||
-rw-r--r-- | apps/codecs/Makefile | 134 | ||||
-rw-r--r-- | apps/plugins/Makefile | 59 |
3 files changed, 102 insertions, 99 deletions
diff --git a/apps/Makefile b/apps/Makefile index 294bc69976..6b3f999112 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -70,7 +70,7 @@ LIBROCKBOX = $(BUILDDIR)/librockbox.a | |||
70 | ifdef SIMVER | 70 | ifdef SIMVER |
71 | # this is a sim build | 71 | # this is a sim build |
72 | 72 | ||
73 | all: build-bitmaps $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) | 73 | all: $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) |
74 | 74 | ||
75 | else | 75 | else |
76 | # regular target build | 76 | # regular target build |
@@ -82,7 +82,7 @@ else | |||
82 | REALBIN = $(BUILDDIR)/$(BINARY) | 82 | REALBIN = $(BUILDDIR)/$(BINARY) |
83 | endif | 83 | endif |
84 | 84 | ||
85 | all: build-bitmaps $(REALBIN) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM) | 85 | all: $(REALBIN) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM) |
86 | endif | 86 | endif |
87 | 87 | ||
88 | dep: $(DEPFILE) | 88 | dep: $(DEPFILE) |
@@ -94,7 +94,9 @@ build-codecs: | |||
94 | build-bitmaps: | 94 | build-bitmaps: |
95 | @$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps | 95 | @$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps |
96 | 96 | ||
97 | rocks: | 97 | $(BITMAPLIBS): build-bitmaps |
98 | |||
99 | rocks: build-codecs | ||
98 | @$(MAKE) -C plugins/lib OBJDIR=$(OBJDIR)/plugins/lib | 100 | @$(MAKE) -C plugins/lib OBJDIR=$(OBJDIR)/plugins/lib |
99 | @$(MAKE) -C plugins OBJDIR=$(OBJDIR)/plugins | 101 | @$(MAKE) -C plugins OBJDIR=$(OBJDIR)/plugins |
100 | 102 | ||
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile index 915e922278..c93b59b8f4 100644 --- a/apps/codecs/Makefile +++ b/apps/codecs/Makefile | |||
@@ -43,34 +43,33 @@ CODECDEPS = $(LINKCODEC) $(BUILDDIR)/libcodec.a | |||
43 | 43 | ||
44 | OUTPUT = $(SOFTWARECODECS) | 44 | OUTPUT = $(SOFTWARECODECS) |
45 | 45 | ||
46 | all: $(OUTPUT) $(ROCKS) | 46 | all: $(ROCKS) |
47 | 47 | ||
48 | ifndef SIMVER | 48 | ifndef SIMVER |
49 | ELFIT = $(SILENT)(file=`basename $@`; \ | 49 | NULL = |
50 | echo "LD $$file"; \ | 50 | |
51 | $(CC) $(GCCOPTS) -O -nostdlib -o $@ $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map) | 51 | $(OBJDIR)/wav.elf : $(NULL) |
52 | 52 | $(OBJDIR)/aiff.elf : $(NULL) | |
53 | .elf.o: | 53 | $(OBJDIR)/mpa.elf : $(BUILDDIR)/libmad.a |
54 | $(ELFIT) | 54 | $(OBJDIR)/a52.elf : $(BUILDDIR)/liba52.a |
55 | 55 | $(OBJDIR)/flac.elf : $(BUILDDIR)/libffmpegFLAC.a | |
56 | $(OBJDIR)/mpa.elf: $(OBJDIR)/mpa.o $(CODECDEPS) $(BUILDDIR)/libmad.a | 56 | $(OBJDIR)/vorbis.elf : $(BUILDDIR)/libTremor.a |
57 | $(OBJDIR)/a52.elf: $(OBJDIR)/a52.o $(CODECDEPS) $(BUILDDIR)/liba52.a | 57 | $(OBJDIR)/mpc.elf : $(BUILDDIR)/libmusepack.a |
58 | $(OBJDIR)/flac.elf: $(OBJDIR)/flac.o $(CODECDEPS) $(BUILDDIR)/libffmpegFLAC.a | 58 | $(OBJDIR)/wavpack.elf : $(BUILDDIR)/libwavpack.a |
59 | $(OBJDIR)/vorbis.elf: $(OBJDIR)/vorbis.o $(CODECDEPS) $(BUILDDIR)/libTremor.a | 59 | $(OBJDIR)/alac.elf : $(BUILDDIR)/libalac.a $(BUILDDIR)/libm4a.a |
60 | $(OBJDIR)/mpc.elf: $(OBJDIR)/mpc.o $(CODECDEPS) $(BUILDDIR)/libmusepack.a | 60 | $(OBJDIR)/aac.elf : $(BUILDDIR)/libfaad.a $(BUILDDIR)/libm4a.a |
61 | $(OBJDIR)/wav.elf: $(OBJDIR)/wav.o $(CODECDEPS) | 61 | $(OBJDIR)/shorten.elf : $(BUILDDIR)/libffmpegFLAC.a |
62 | $(OBJDIR)/wavpack.elf: $(OBJDIR)/wavpack.o $(CODECDEPS) $(BUILDDIR)/libwavpack.a | 62 | |
63 | $(OBJDIR)/alac.elf: $(OBJDIR)/alac.o $(CODECDEPS) $(BUILDDIR)/libalac.a $(BUILDDIR)/libm4a.a | 63 | $(OBJDIR)/%.elf : |
64 | $(OBJDIR)/aac.elf: $(OBJDIR)/aac.o $(CODECDEPS) $(BUILDDIR)/libfaad.a $(BUILDDIR)/libm4a.a | 64 | @echo "LD $(notdir $@)" |
65 | $(OBJDIR)/shorten.elf: $(OBJDIR)/shorten.o $(CODECDEPS) $(BUILDDIR)/libffmpegFLAC.a | 65 | $(SILENT)$(CC) $(GCCOPTS) -O -nostdlib -o $@ $^ -L$(BUILDDIR) -lcodec -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map |
66 | $(OBJDIR)/aiff.elf: $(OBJDIR)/aiff.o $(CODECDEPS) | 66 | |
67 | 67 | $(BUILDDIR)/%.a : % $(CODECDEPS) | |
68 | $(OBJDIR)/%.elf: $(OBJDIR)/%.o $(CODECDEPS) | 68 | |
69 | $(ELFIT) | ||
70 | 69 | ||
71 | $(OBJDIR)/%.codec : $(OBJDIR)/%.elf | 70 | $(OBJDIR)/%.codec : $(OBJDIR)/%.elf |
72 | @echo "OBJCOPY "`basename $@` | 71 | @echo "OBJCOPY $(notdir $@)" |
73 | @$(OC) -O binary $< $@ | 72 | $(SILENT)$(OC) -O binary $< $@ |
74 | else | 73 | else |
75 | 74 | ||
76 | ifeq ($(SIMVER), x11) | 75 | ifeq ($(SIMVER), x11) |
@@ -78,14 +77,14 @@ ifeq ($(SIMVER), x11) | |||
78 | # This is the X11 simulator version | 77 | # This is the X11 simulator version |
79 | 78 | ||
80 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a | 79 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a |
81 | @echo "LD "`basename $@` | 80 | @echo "LD $(notdir $@)" |
82 | @$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ | 81 | $(SILENT)$(CC) $(CFLAGS) -shared $^ -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ |
83 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 82 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
84 | # 'x' must be kept or you'll have "Win32 error 5" | 83 | # 'x' must be kept or you'll have "Win32 error 5" |
85 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 84 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
86 | # #define ERROR_ACCESS_DENIED 5L | 85 | # #define ERROR_ACCESS_DENIED 5L |
87 | else | 86 | else |
88 | @chmod -x $@ | 87 | $(SILENT)chmod -x $@ |
89 | endif | 88 | endif |
90 | 89 | ||
91 | else # end of x11-simulator | 90 | else # end of x11-simulator |
@@ -95,13 +94,13 @@ ifeq ($(SIMVER), sdl) | |||
95 | 94 | ||
96 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a | 95 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a |
97 | @echo "LD "`basename $@` | 96 | @echo "LD "`basename $@` |
98 | @$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ | 97 | $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ |
99 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 98 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
100 | # 'x' must be kept or you'll have "Win32 error 5" | 99 | # 'x' must be kept or you'll have "Win32 error 5" |
101 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 100 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
102 | # #define ERROR_ACCESS_DENIED 5L | 101 | # #define ERROR_ACCESS_DENIED 5L |
103 | else | 102 | else |
104 | @chmod -x $@ | 103 | $(SILENT)chmod -x $@ |
105 | endif | 104 | endif |
106 | 105 | ||
107 | else # end of sdl-simulator | 106 | else # end of sdl-simulator |
@@ -111,16 +110,16 @@ DLLTOOLFLAGS = --export-all | |||
111 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin | 110 | DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin |
112 | 111 | ||
113 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a | 112 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a |
114 | @echo "DLL "`basename $@` | 113 | @echo "DLL $(notdir $@)" |
115 | @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< | 114 | $(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< |
116 | @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libcodec.a \ | 115 | $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libcodec.a \ |
117 | $(patsubst -l%,$(BUILDDIR)/lib%.a,$(CODECLIBS)) -o $@ | 116 | $(patsubst -l%,$(BUILDDIR)/lib%.a,$(CODECLIBS)) -o $@ |
118 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 117 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
119 | # 'x' must be kept or you'll have "Win32 error 5" | 118 | # 'x' must be kept or you'll have "Win32 error 5" |
120 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 119 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
121 | # #define ERROR_ACCESS_DENIED 5L | 120 | # #define ERROR_ACCESS_DENIED 5L |
122 | else | 121 | else |
123 | @chmod -x $@ | 122 | $(SILENT)chmod -x $@ |
124 | endif | 123 | endif |
125 | endif # end of win32-simulator | 124 | endif # end of win32-simulator |
126 | endif | 125 | endif |
@@ -131,76 +130,77 @@ include $(TOOLSDIR)/make.inc | |||
131 | 130 | ||
132 | $(BUILDDIR)/libcodec.a: | 131 | $(BUILDDIR)/libcodec.a: |
133 | @echo "MAKE in codecs/lib" | 132 | @echo "MAKE in codecs/lib" |
134 | @mkdir -p $(OBJDIR)/lib | 133 | $(SILENT)mkdir -p $(OBJDIR)/lib |
135 | @$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib | 134 | $(SILENT)$(MAKE) -C lib OBJDIR=$(OBJDIR)/lib |
136 | 135 | ||
137 | $(LINKCODEC): $(LDS) | 136 | $(LINKCODEC): $(LDS) |
138 | @echo "build $@" | 137 | @echo "build $@" |
139 | @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) -DCODEC $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ | 138 | $(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) -DCODEC $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ |
140 | 139 | ||
141 | libmad: | 140 | libmad: |
142 | @echo "MAKE in libmad" | 141 | @echo "MAKE in libmad" |
143 | @mkdir -p $(OBJDIR)/libmad | 142 | $(SILENT)mkdir -p $(OBJDIR)/libmad |
144 | @$(MAKE) -C libmad OBJDIR=$(OBJDIR)/libmad OUTPUT=$(BUILDDIR)/libmad.a | 143 | $(SILENT)$(MAKE) -C libmad OBJDIR=$(OBJDIR)/libmad OUTPUT=$(BUILDDIR)/libmad.a |
145 | 144 | ||
146 | liba52: | 145 | liba52: |
147 | @echo "MAKE in liba52" | 146 | @echo "MAKE in liba52" |
148 | @mkdir -p $(OBJDIR)/liba52 | 147 | $(SILENT)mkdir -p $(OBJDIR)/liba52 |
149 | @$(MAKE) -C liba52 OBJDIR=$(OBJDIR)/liba52 OUTPUT=$(BUILDDIR)/liba52.a | 148 | $(SILENT)$(MAKE) -C liba52 OBJDIR=$(OBJDIR)/liba52 OUTPUT=$(BUILDDIR)/liba52.a |
150 | 149 | ||
151 | libffmpegFLAC: | 150 | libffmpegFLAC: |
152 | @echo "MAKE in libffmpegFLAC" | 151 | @echo "MAKE in libffmpegFLAC" |
153 | @mkdir -p $(OBJDIR)/libffmpegFLAC | 152 | $(SILENT)mkdir -p $(OBJDIR)/libffmpegFLAC |
154 | @$(MAKE) -C libffmpegFLAC OBJDIR=$(OBJDIR)/libffmpegFLAC OUTPUT=$(BUILDDIR)/libffmpegFLAC.a | 153 | $(SILENT)$(MAKE) -C libffmpegFLAC OBJDIR=$(OBJDIR)/libffmpegFLAC OUTPUT=$(BUILDDIR)/libffmpegFLAC.a |
155 | 154 | ||
156 | libTremor: | 155 | libTremor: |
157 | @echo "MAKE in Tremor" | 156 | @echo "MAKE in Tremor" |
158 | @mkdir -p $(OBJDIR)/Tremor | 157 | $(SILENT)mkdir -p $(OBJDIR)/Tremor |
159 | @$(MAKE) -C Tremor OBJDIR=$(OBJDIR)/Tremor OUTPUT=$(BUILDDIR)/libTremor.a | 158 | $(SILENT)$(MAKE) -C Tremor OBJDIR=$(OBJDIR)/Tremor OUTPUT=$(BUILDDIR)/libTremor.a |
160 | 159 | ||
161 | libwavpack: | 160 | libwavpack: |
162 | @echo "MAKE in libwavpack" | 161 | @echo "MAKE in libwavpack" |
163 | @mkdir -p $(OBJDIR)/libwavpack | 162 | $(SILENT)mkdir -p $(OBJDIR)/libwavpack |
164 | @$(MAKE) -C libwavpack OBJDIR=$(OBJDIR)/libwavpack OUTPUT=$(BUILDDIR)/libwavpack.a | 163 | $(SILENT)$(MAKE) -C libwavpack OBJDIR=$(OBJDIR)/libwavpack OUTPUT=$(BUILDDIR)/libwavpack.a |
165 | 164 | ||
166 | dumb: | 165 | dumb: |
167 | @echo "MAKE in dumb" | 166 | @echo "MAKE in dumb" |
168 | @mkdir -p $(OBJDIR)/dumb | 167 | $(SILENT)mkdir -p $(OBJDIR)/dumb |
169 | @$(MAKE) -C dumb OBJDIR=$(OBJDIR)/dumb LIBDIR=$(BUILDDIR) OFLAGS="$(CFLAGS)" | 168 | $(SILENT)$(MAKE) -C dumb OBJDIR=$(OBJDIR)/dumb LIBDIR=$(BUILDDIR) OFLAGS="$(CFLAGS)" |
170 | 169 | ||
171 | libmusepack: | 170 | libmusepack: |
172 | @echo "MAKE in libmusepack" | 171 | @echo "MAKE in libmusepack" |
173 | @mkdir -p $(OBJDIR)/libmusepack | 172 | $(SILENT)mkdir -p $(OBJDIR)/libmusepack |
174 | @$(MAKE) -C libmusepack OBJDIR=$(OBJDIR)/libmusepack OUTPUT=$(BUILDDIR)/libmusepack.a | 173 | $(SILENT)$(MAKE) -C libmusepack OBJDIR=$(OBJDIR)/libmusepack OUTPUT=$(BUILDDIR)/libmusepack.a |
175 | 174 | ||
176 | libalac: | 175 | libalac: |
177 | @echo "MAKE in libalac" | 176 | @echo "MAKE in libalac" |
178 | @mkdir -p $(OBJDIR)/libalac | 177 | $(SILENT)mkdir -p $(OBJDIR)/libalac |
179 | @$(MAKE) -C libalac OBJDIR=$(OBJDIR)/libalac OUTPUT=$(BUILDDIR)/libalac.a | 178 | $(SILENT)$(MAKE) -C libalac OBJDIR=$(OBJDIR)/libalac OUTPUT=$(BUILDDIR)/libalac.a |
179 | |||
180 | libm4a: | 180 | libm4a: |
181 | @echo "MAKE in libm4a" | 181 | @echo "MAKE in libm4a" |
182 | @mkdir -p $(OBJDIR)/libm4a | 182 | $(SILENT)mkdir -p $(OBJDIR)/libm4a |
183 | @$(MAKE) -C libm4a OBJDIR=$(OBJDIR)/libm4a OUTPUT=$(BUILDDIR)/libm4a.a | 183 | $(SILENT)$(MAKE) -C libm4a OBJDIR=$(OBJDIR)/libm4a OUTPUT=$(BUILDDIR)/libm4a.a |
184 | 184 | ||
185 | libfaad: | 185 | libfaad: |
186 | @echo "MAKE in libfaad" | 186 | @echo "MAKE in libfaad" |
187 | @mkdir -p $(OBJDIR)/libfaad | 187 | $(SILENT)mkdir -p $(OBJDIR)/libfaad |
188 | @$(MAKE) -C libfaad OBJDIR=$(OBJDIR)/libfaad OUTPUT=$(BUILDDIR)/libfaad.a | 188 | $(SILENT)$(MAKE) -C libfaad OBJDIR=$(OBJDIR)/libfaad OUTPUT=$(BUILDDIR)/libfaad.a |
189 | 189 | ||
190 | clean: | 190 | clean: |
191 | @echo "cleaning codecs" | 191 | @echo "cleaning codecs" |
192 | $(SILENT)rm -fr $(OBJDIR)/libmad $(BUILDDIR)/libmad.a $(OBJDIR)/liba52 $(BUILDDIR)/liba52.a $(OBJDIR)/libffmpegFLAC $(BUILDDIR)/libffmpegFLAC.a $(OBJDIR)/Tremor $(BUILDDIR)/libTremor.a $(OBJDIR)/libwavpack $(BUILDDIR)/libwavpack.a $(OBJDIR)/dumb $(BUILDDIR)/libdumb.a $(BUILDDIR)/libdumbd.a $(OBJDIR)/libmusepack $(BUILDDIR)/libmusepack.a $(OBJDIR)/libalac $(BUILDDIR)/libalac.a $(OBJDIR)/libfaad $(BUILDDIR)/libfaad.a $(OBJDIR)/libm4a $(BUILDDIR)/libm4a.a | 192 | $(SILENT)rm -fr $(OBJDIR)/libmad $(BUILDDIR)/libmad.a $(OBJDIR)/liba52 $(BUILDDIR)/liba52.a $(OBJDIR)/libffmpegFLAC $(BUILDDIR)/libffmpegFLAC.a $(OBJDIR)/Tremor $(BUILDDIR)/libTremor.a $(OBJDIR)/libwavpack $(BUILDDIR)/libwavpack.a $(OBJDIR)/dumb $(BUILDDIR)/libdumb.a $(BUILDDIR)/libdumbd.a $(OBJDIR)/libmusepack $(BUILDDIR)/libmusepack.a $(OBJDIR)/libalac $(BUILDDIR)/libalac.a $(OBJDIR)/libfaad $(BUILDDIR)/libfaad.a $(OBJDIR)/libm4a $(BUILDDIR)/libm4a.a |
193 | @$(MAKE) -C libmad clean OBJDIR=$(OBJDIR)/libmad | 193 | $(SILENT)$(MAKE) -C libmad clean OBJDIR=$(OBJDIR)/libmad |
194 | @$(MAKE) -C liba52 clean OBJDIR=$(OBJDIR)/liba52 | 194 | $(SILENT)$(MAKE) -C liba52 clean OBJDIR=$(OBJDIR)/liba52 |
195 | @$(MAKE) -C libffmpegFLAC clean OBJDIR=$(OBJDIR)/libffmpegFLAC | 195 | $(SILENT)$(MAKE) -C libffmpegFLAC clean OBJDIR=$(OBJDIR)/libffmpegFLAC |
196 | @$(MAKE) -C Tremor clean OBJDIR=$(OBJDIR)/Tremor | 196 | $(SILENT)$(MAKE) -C Tremor clean OBJDIR=$(OBJDIR)/Tremor |
197 | @$(MAKE) -C libwavpack clean OBJDIR=$(OBJDIR)/libwavpack | 197 | $(SILENT)$(MAKE) -C libwavpack clean OBJDIR=$(OBJDIR)/libwavpack |
198 | @$(MAKE) -C libmusepack clean OBJDIR=$(OBJDIR)/libmusepack | 198 | $(SILENT)$(MAKE) -C libmusepack clean OBJDIR=$(OBJDIR)/libmusepack |
199 | @$(MAKE) -C libalac clean OBJDIR=$(OBJDIR)/libalac | 199 | $(SILENT)$(MAKE) -C libalac clean OBJDIR=$(OBJDIR)/libalac |
200 | @$(MAKE) -C libfaad clean OBJDIR=$(OBJDIR)/libfaad | 200 | $(SILENT)$(MAKE) -C libfaad clean OBJDIR=$(OBJDIR)/libfaad |
201 | @$(MAKE) -C libm4a clean OBJDIR=$(OBJDIR)/libm4a | 201 | $(SILENT)$(MAKE) -C libm4a clean OBJDIR=$(OBJDIR)/libm4a |
202 | @$(MAKE) -C dumb clean OBJDIR=$(OBJDIR)/dumb | 202 | $(SILENT)$(MAKE) -C dumb clean OBJDIR=$(OBJDIR)/dumb |
203 | @$(MAKE) -C lib clean OBJDIR=$(OBJDIR)/lib | 203 | $(SILENT)$(MAKE) -C lib clean OBJDIR=$(OBJDIR)/lib |
204 | 204 | ||
205 | ifneq ($(MAKECMDGOALS),clean) | 205 | ifneq ($(MAKECMDGOALS),clean) |
206 | -include $(DEPFILE) | 206 | -include $(DEPFILE) |
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index adc956f8d2..67265a3ca4 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile | |||
@@ -70,29 +70,30 @@ endif | |||
70 | 70 | ||
71 | 71 | ||
72 | .PHONY: $(SUBDIRS) | 72 | .PHONY: $(SUBDIRS) |
73 | all: build-bitmaps $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) | 73 | all: $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) |
74 | 74 | ||
75 | $(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS | 75 | $(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS |
76 | @echo "create credits.raw" | 76 | @echo "create credits.raw" |
77 | @perl credits.pl < $< > $@ | 77 | $(SILENT)perl credits.pl < $< > $@ |
78 | 78 | ||
79 | $(OBJDIR)/credits.o: credits.c $(BUILDDIR)/credits.raw | 79 | $(OBJDIR)/credits.o: credits.c $(BUILDDIR)/credits.raw |
80 | @mkdir -p `dirname $@` | 80 | $(SILENT)mkdir -p $(dir $@) |
81 | @echo "CC $<" | 81 | @echo "CC $<" |
82 | @$(CC) $(CFLAGS) -I$(OBJDIR) -c $< -o $@ | 82 | $(SILENT)$(CC) $(CFLAGS) -I$(OBJDIR) -c $< -o $@ |
83 | 83 | ||
84 | build-bitmaps: | 84 | build-bitmaps: |
85 | @$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps | 85 | $(SILENT)$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps |
86 | |||
87 | $(BITMAPLIBS): build-bitmaps | ||
86 | 88 | ||
87 | ifndef SIMVER | 89 | ifndef SIMVER |
88 | $(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE) $(BUILDDIR)/libplugin.a $(BITMAPLIBS) | 90 | $(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE) $(BUILDDIR)/libplugin.a $(BITMAPLIBS) |
89 | $(SILENT)(file=`basename $@`; \ | 91 | @echo "LD $(notdir $@)" |
90 | echo "LD $$file"; \ | 92 | $(SILENT)$(CC) $(GCCOPTS) -O -nostdlib -o $@ $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,--gc-sections -Wl,-Map,$(OBJDIR)/$*.map |
91 | $(CC) $(GCCOPTS) -O -nostdlib -o $@ $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,--gc-sections -Wl,-Map,$(OBJDIR)/$*.map) | ||
92 | 93 | ||
93 | $(OBJDIR)/%.rock : $(OBJDIR)/%.elf | 94 | $(OBJDIR)/%.rock : $(OBJDIR)/%.elf |
94 | @echo "OBJCOPY "`basename $@` | 95 | @echo "OBJCOPY "`basename $@` |
95 | @$(OC) -O binary $< $@ | 96 | $(SILENT)$(OC) -O binary $< $@ |
96 | else | 97 | else |
97 | 98 | ||
98 | ifeq ($(SIMVER), x11) | 99 | ifeq ($(SIMVER), x11) |
@@ -101,13 +102,13 @@ ifeq ($(SIMVER), x11) | |||
101 | 102 | ||
102 | $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a | 103 | $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a |
103 | @echo "LD "`basename $@` | 104 | @echo "LD "`basename $@` |
104 | @$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@ | 105 | $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@ |
105 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 106 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
106 | # 'x' must be kept or you'll have "Win32 error 5" | 107 | # 'x' must be kept or you'll have "Win32 error 5" |
107 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 108 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
108 | # #define ERROR_ACCESS_DENIED 5L | 109 | # #define ERROR_ACCESS_DENIED 5L |
109 | else | 110 | else |
110 | @chmod -x $@ | 111 | $(SILENT)chmod -x $@ |
111 | endif | 112 | endif |
112 | 113 | ||
113 | else # end of x11-simulator | 114 | else # end of x11-simulator |
@@ -117,13 +118,13 @@ ifeq ($(SIMVER), sdl) | |||
117 | 118 | ||
118 | $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a | 119 | $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a |
119 | @echo "LD "`basename $@` | 120 | @echo "LD "`basename $@` |
120 | @$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@ | 121 | $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@ |
121 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 122 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
122 | # 'x' must be kept or you'll have "Win32 error 5" | 123 | # 'x' must be kept or you'll have "Win32 error 5" |
123 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 124 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
124 | # #define ERROR_ACCESS_DENIED 5L | 125 | # #define ERROR_ACCESS_DENIED 5L |
125 | else | 126 | else |
126 | @chmod -x $@ | 127 | $(SILENT)chmod -x $@ |
127 | endif | 128 | endif |
128 | 129 | ||
129 | else # end of sdl-simulator | 130 | else # end of sdl-simulator |
@@ -134,15 +135,15 @@ DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin | |||
134 | 135 | ||
135 | $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a | 136 | $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a |
136 | @echo "DLL "`basename $@` | 137 | @echo "DLL "`basename $@` |
137 | @$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< | 138 | $(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< |
138 | @$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libplugin.a $(BITMAPLIBS) \ | 139 | $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libplugin.a $(BITMAPLIBS) \ |
139 | $(patsubst -l%,$(BUILDDIR)/lib%.a,$(CODECLIBS)) -o $@ | 140 | $(patsubst -l%,$(BUILDDIR)/lib%.a,$(CODECLIBS)) -o $@ |
140 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 141 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
141 | # 'x' must be kept or you'll have "Win32 error 5" | 142 | # 'x' must be kept or you'll have "Win32 error 5" |
142 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | 143 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 |
143 | # #define ERROR_ACCESS_DENIED 5L | 144 | # #define ERROR_ACCESS_DENIED 5L |
144 | else | 145 | else |
145 | @chmod -x $@ | 146 | $(SILENT)chmod -x $@ |
146 | endif | 147 | endif |
147 | endif # end of win32-simulator | 148 | endif # end of win32-simulator |
148 | endif | 149 | endif |
@@ -159,26 +160,26 @@ $(BUILDDIR)/libplugin.a: | |||
159 | $(BUILDDIR)/libpluginbitmapsnative.a: | 160 | $(BUILDDIR)/libpluginbitmapsnative.a: |
160 | @echo "MAKE in plugins/bitmaps/native" | 161 | @echo "MAKE in plugins/bitmaps/native" |
161 | $(SILENT)mkdir -p $(OBJDIR)/bitmaps/native | 162 | $(SILENT)mkdir -p $(OBJDIR)/bitmaps/native |
162 | @$(MAKE) -C bitmaps/native OBJDIR=$(OBJDIR)/bitmaps/native | 163 | $(SILENT)$(MAKE) -C bitmaps/native OBJDIR=$(OBJDIR)/bitmaps/native |
163 | 164 | ||
164 | $(BUILDDIR)/libpluginbitmapsmono.a: | 165 | $(BUILDDIR)/libpluginbitmapsmono.a: |
165 | @echo "MAKE in plugins/bitmaps/mono" | 166 | @echo "MAKE in plugins/bitmaps/mono" |
166 | $(SILENT)mkdir -p $(OBJDIR)/bitmaps/mono | 167 | $(SILENT)mkdir -p $(OBJDIR)/bitmaps/mono |
167 | @$(MAKE) -C bitmaps/mono OBJDIR=$(OBJDIR)/bitmaps/mono | 168 | $(SILENT)$(MAKE) -C bitmaps/mono OBJDIR=$(OBJDIR)/bitmaps/mono |
168 | 169 | ||
169 | $(BUILDDIR)/libpluginbitmapsremotenative.a: | 170 | $(BUILDDIR)/libpluginbitmapsremotenative.a: |
170 | @echo "MAKE in plugins/bitmaps/remote_native" | 171 | @echo "MAKE in plugins/bitmaps/remote_native" |
171 | $(SILENT)mkdir -p $(OBJDIR)/bitmaps/remote_native | 172 | $(SILENT)mkdir -p $(OBJDIR)/bitmaps/remote_native |
172 | @$(MAKE) -C bitmaps/remote_native OBJDIR=$(OBJDIR)/bitmaps/remote_native | 173 | $(SILENT)$(MAKE) -C bitmaps/remote_native OBJDIR=$(OBJDIR)/bitmaps/remote_native |
173 | 174 | ||
174 | $(BUILDDIR)/libpluginbitmapsremotemono.a: | 175 | $(BUILDDIR)/libpluginbitmapsremotemono.a: |
175 | @echo "MAKE in plugins/bitmaps/remote_mono" | 176 | @echo "MAKE in plugins/bitmaps/remote_mono" |
176 | $(SILENT)mkdir -p $(OBJDIR)/bitmaps/remote_mono | 177 | $(SILENT)mkdir -p $(OBJDIR)/bitmaps/remote_mono |
177 | @$(MAKE) -C bitmaps/remote_mono OBJDIR=$(OBJDIR)/bitmaps/remote_mono | 178 | $(SILENT)$(MAKE) -C bitmaps/remote_mono OBJDIR=$(OBJDIR)/bitmaps/remote_mono |
178 | 179 | ||
179 | $(LINKFILE): $(LDS) | 180 | $(LINKFILE): $(LDS) |
180 | @echo "build $@" | 181 | @echo "build $@" |
181 | @cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ | 182 | $(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ |
182 | 183 | ||
183 | $(SUBDIRS): | 184 | $(SUBDIRS): |
184 | @echo "MAKE in $@" | 185 | @echo "MAKE in $@" |
@@ -187,14 +188,14 @@ $(SUBDIRS): | |||
187 | 188 | ||
188 | clean: | 189 | clean: |
189 | @echo "cleaning plugins" | 190 | @echo "cleaning plugins" |
190 | @rm -f $(ROCKS) $(LINKFILE) $(OBJDIR)/*.rock $(DEPFILE) $(ELFS) \ | 191 | $(SILENT)rm -f $(ROCKS) $(LINKFILE) $(OBJDIR)/*.rock $(DEPFILE) $(ELFS) \ |
191 | $(BUILDDIR)/credits.raw $(OBJS) $(DEFS) | 192 | $(BUILDDIR)/credits.raw $(OBJS) $(DEFS) |
192 | @$(MAKE) -C lib clean OBJDIR=$(OBJDIR)/lib | 193 | $(SILENT)$(MAKE) -C lib clean OBJDIR=$(OBJDIR)/lib |
193 | @$(MAKE) -C bitmaps/mono clean OBJDIR=$(OBJDIR)/bitmaps/mono | 194 | $(SILENT)$(MAKE) -C bitmaps/mono clean OBJDIR=$(OBJDIR)/bitmaps/mono |
194 | @$(MAKE) -C bitmaps/native clean OBJDIR=$(OBJDIR)/bitmaps/native | 195 | $(SILENT)$(MAKE) -C bitmaps/native clean OBJDIR=$(OBJDIR)/bitmaps/native |
195 | @$(MAKE) -C bitmaps/remote_mono clean OBJDIR=$(OBJDIR)/bitmaps/remote_mono | 196 | $(SILENT)$(MAKE) -C bitmaps/remote_mono clean OBJDIR=$(OBJDIR)/bitmaps/remote_mono |
196 | @$(MAKE) -C bitmaps/remote_native clean OBJDIR=$(OBJDIR)/bitmaps/remote_native | 197 | $(SILENT)$(MAKE) -C bitmaps/remote_native clean OBJDIR=$(OBJDIR)/bitmaps/remote_native |
197 | @$(MAKE) -C rockboy clean OBJDIR=$(OBJDIR)/rockboy | 198 | $(SILENT)$(MAKE) -C rockboy clean OBJDIR=$(OBJDIR)/rockboy |
198 | @$(MAKE) -C searchengine clean OBJDIR=$(OBJDIR)/searchengine | 199 | $(SILENT)$(MAKE) -C searchengine clean OBJDIR=$(OBJDIR)/searchengine |
199 | 200 | ||
200 | -include $(DEPFILE) | 201 | -include $(DEPFILE) |