diff options
author | Daniel Stenberg <daniel@haxx.se> | 2006-09-02 22:34:13 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2006-09-02 22:34:13 +0000 |
commit | 55a3018cdd246168cf6b8286032383e7831226ad (patch) | |
tree | c85e0f527616126ca3ead68797223460843b3e57 /apps | |
parent | ce9fe07d51b9e3ff1625314a58111794dd351729 (diff) | |
download | rockbox-55a3018cdd246168cf6b8286032383e7831226ad.tar.gz rockbox-55a3018cdd246168cf6b8286032383e7831226ad.zip |
more make magic to heal the broken builds
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10860 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/codecs/Makefile | 31 | ||||
-rw-r--r-- | apps/codecs/Tremor/Makefile | 4 |
2 files changed, 26 insertions, 9 deletions
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile index 695b4546b0..fb1228d7fc 100644 --- a/apps/codecs/Makefile +++ b/apps/codecs/Makefile | |||
@@ -43,9 +43,11 @@ CODECDEPS = $(LINKCODEC) $(BUILDDIR)/libcodec.a | |||
43 | 43 | ||
44 | OUTPUT = $(SOFTWARECODECS) | 44 | OUTPUT = $(SOFTWARECODECS) |
45 | 45 | ||
46 | all: $(ROCKS) | 46 | all: $(LINKCODEC) $(ROCKS) |
47 | 47 | ||
48 | ifndef SIMVER | 48 | ifndef SIMVER |
49 | $(BUILDDIR)/%.a : % $(CODECDEPS) | ||
50 | |||
49 | $(OBJDIR)/wav.elf : $(OBJDIR)/wav.o | 51 | $(OBJDIR)/wav.elf : $(OBJDIR)/wav.o |
50 | $(OBJDIR)/sid.elf : $(OBJDIR)/sid.o | 52 | $(OBJDIR)/sid.elf : $(OBJDIR)/sid.o |
51 | $(OBJDIR)/aiff.elf : $(OBJDIR)/aiff.o | 53 | $(OBJDIR)/aiff.elf : $(OBJDIR)/aiff.o |
@@ -62,12 +64,9 @@ $(OBJDIR)/mp3_enc.elf: $(OBJDIR)/mp3_enc.o | |||
62 | $(OBJDIR)/wav_enc.elf: $(OBJDIR)/wav_enc.o | 64 | $(OBJDIR)/wav_enc.elf: $(OBJDIR)/wav_enc.o |
63 | $(OBJDIR)/wavpack_enc.elf: $(OBJDIR)/wavpack_enc.o $(BUILDDIR)/libwavpack.a | 65 | $(OBJDIR)/wavpack_enc.elf: $(OBJDIR)/wavpack_enc.o $(BUILDDIR)/libwavpack.a |
64 | 66 | ||
65 | $(OBJDIR)/%.elf : | 67 | $(OBJDIR)/%.elf: |
66 | @echo "LD $(notdir $@)" | 68 | @echo "LD $(notdir $@)" |
67 | $(SILENT)$(CC) $(GCCOPTS) -O -nostdlib -o $@ $^ -L$(BUILDDIR) -lcodec \ | 69 | $(SILENT)$(CC) $(GCCOPTS) -O -nostdlib -o $@ $^ -L$(BUILDDIR) -lcodec -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map |
68 | -lgcc -T$(LINKCODEC) -Wl,-Map,$(OBJDIR)/$*.map | ||
69 | |||
70 | $(BUILDDIR)/%.a : % $(CODECDEPS) | ||
71 | 70 | ||
72 | $(OBJDIR)/%.codec : $(OBJDIR)/%.elf | 71 | $(OBJDIR)/%.codec : $(OBJDIR)/%.elf |
73 | @echo "OBJCOPY $(notdir $@)" | 72 | @echo "OBJCOPY $(notdir $@)" |
@@ -95,7 +94,7 @@ ifeq ($(SIMVER), sdl) | |||
95 | # This is the SDL simulator version | 94 | # This is the SDL simulator version |
96 | 95 | ||
97 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) | 96 | $(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT) |
98 | @echo "LD $(notdir $@)" | 97 | @echo "LD $(notdir $@) $^" |
99 | $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ | 98 | $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ |
100 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | 99 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) |
101 | # 'x' must be kept or you'll have "Win32 error 5" | 100 | # 'x' must be kept or you'll have "Win32 error 5" |
@@ -140,26 +139,36 @@ $(LINKCODEC): $(LDS) | |||
140 | @echo "build $@" | 139 | @echo "build $@" |
141 | $(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) -DCODEC $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ | 140 | $(SILENT)cat $< | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) -DCODEC $(INCLUDES) $(TARGET) $(DEFINES) -E -P - >$@ |
142 | 141 | ||
142 | $(BUILDDIR)/libmad.a: libmad | ||
143 | |||
143 | libmad: | 144 | libmad: |
144 | @echo "MAKE in libmad" | 145 | @echo "MAKE in libmad" |
145 | $(SILENT)mkdir -p $(OBJDIR)/libmad | 146 | $(SILENT)mkdir -p $(OBJDIR)/libmad |
146 | $(SILENT)$(MAKE) -C libmad OBJDIR=$(OBJDIR)/libmad OUTPUT=$(BUILDDIR)/libmad.a | 147 | $(SILENT)$(MAKE) -C libmad OBJDIR=$(OBJDIR)/libmad OUTPUT=$(BUILDDIR)/libmad.a |
147 | 148 | ||
149 | $(BUILDDIR)/liba52.a: liba52 | ||
150 | |||
148 | liba52: | 151 | liba52: |
149 | @echo "MAKE in liba52" | 152 | @echo "MAKE in liba52" |
150 | $(SILENT)mkdir -p $(OBJDIR)/liba52 | 153 | $(SILENT)mkdir -p $(OBJDIR)/liba52 |
151 | $(SILENT)$(MAKE) -C liba52 OBJDIR=$(OBJDIR)/liba52 OUTPUT=$(BUILDDIR)/liba52.a | 154 | $(SILENT)$(MAKE) -C liba52 OBJDIR=$(OBJDIR)/liba52 OUTPUT=$(BUILDDIR)/liba52.a |
152 | 155 | ||
156 | $(BUILDDIR)/libffmpegFLAC.a: libffmpegFLAC | ||
157 | |||
153 | libffmpegFLAC: | 158 | libffmpegFLAC: |
154 | @echo "MAKE in libffmpegFLAC" | 159 | @echo "MAKE in libffmpegFLAC" |
155 | $(SILENT)mkdir -p $(OBJDIR)/libffmpegFLAC | 160 | $(SILENT)mkdir -p $(OBJDIR)/libffmpegFLAC |
156 | $(SILENT)$(MAKE) -C libffmpegFLAC OBJDIR=$(OBJDIR)/libffmpegFLAC OUTPUT=$(BUILDDIR)/libffmpegFLAC.a | 161 | $(SILENT)$(MAKE) -C libffmpegFLAC OBJDIR=$(OBJDIR)/libffmpegFLAC OUTPUT=$(BUILDDIR)/libffmpegFLAC.a |
157 | 162 | ||
163 | $(BUILDDIR)/libTremor.a: libTremor | ||
164 | |||
158 | libTremor: | 165 | libTremor: |
159 | @echo "MAKE in Tremor" | 166 | @echo "MAKE in Tremor" |
160 | $(SILENT)mkdir -p $(OBJDIR)/Tremor | 167 | $(SILENT)mkdir -p $(OBJDIR)/Tremor |
161 | $(SILENT)$(MAKE) -C Tremor OBJDIR=$(OBJDIR)/Tremor OUTPUT=$(BUILDDIR)/libTremor.a | 168 | $(SILENT)$(MAKE) -C Tremor OBJDIR=$(OBJDIR)/Tremor OUTPUT=$(BUILDDIR)/libTremor.a |
162 | 169 | ||
170 | $(BUILDDIR)/libwavpack.a: libwavpack | ||
171 | |||
163 | libwavpack: | 172 | libwavpack: |
164 | @echo "MAKE in libwavpack" | 173 | @echo "MAKE in libwavpack" |
165 | $(SILENT)mkdir -p $(OBJDIR)/libwavpack | 174 | $(SILENT)mkdir -p $(OBJDIR)/libwavpack |
@@ -170,21 +179,29 @@ dumb: | |||
170 | $(SILENT)mkdir -p $(OBJDIR)/dumb | 179 | $(SILENT)mkdir -p $(OBJDIR)/dumb |
171 | $(SILENT)$(MAKE) -C dumb OBJDIR=$(OBJDIR)/dumb LIBDIR=$(BUILDDIR) OFLAGS="$(CFLAGS)" | 180 | $(SILENT)$(MAKE) -C dumb OBJDIR=$(OBJDIR)/dumb LIBDIR=$(BUILDDIR) OFLAGS="$(CFLAGS)" |
172 | 181 | ||
182 | $(BUILDDIR)/libmusepack.a: libmusepack | ||
183 | |||
173 | libmusepack: | 184 | libmusepack: |
174 | @echo "MAKE in libmusepack" | 185 | @echo "MAKE in libmusepack" |
175 | $(SILENT)mkdir -p $(OBJDIR)/libmusepack | 186 | $(SILENT)mkdir -p $(OBJDIR)/libmusepack |
176 | $(SILENT)$(MAKE) -C libmusepack OBJDIR=$(OBJDIR)/libmusepack OUTPUT=$(BUILDDIR)/libmusepack.a | 187 | $(SILENT)$(MAKE) -C libmusepack OBJDIR=$(OBJDIR)/libmusepack OUTPUT=$(BUILDDIR)/libmusepack.a |
177 | 188 | ||
189 | $(BUILDDIR)/libalac.a: libalac | ||
190 | |||
178 | libalac: | 191 | libalac: |
179 | @echo "MAKE in libalac" | 192 | @echo "MAKE in libalac" |
180 | $(SILENT)mkdir -p $(OBJDIR)/libalac | 193 | $(SILENT)mkdir -p $(OBJDIR)/libalac |
181 | $(SILENT)$(MAKE) -C libalac OBJDIR=$(OBJDIR)/libalac OUTPUT=$(BUILDDIR)/libalac.a | 194 | $(SILENT)$(MAKE) -C libalac OBJDIR=$(OBJDIR)/libalac OUTPUT=$(BUILDDIR)/libalac.a |
182 | 195 | ||
196 | $(BUILDDIR)/libm4a.a: libm4a | ||
197 | |||
183 | libm4a: | 198 | libm4a: |
184 | @echo "MAKE in libm4a" | 199 | @echo "MAKE in libm4a" |
185 | $(SILENT)mkdir -p $(OBJDIR)/libm4a | 200 | $(SILENT)mkdir -p $(OBJDIR)/libm4a |
186 | $(SILENT)$(MAKE) -C libm4a OBJDIR=$(OBJDIR)/libm4a OUTPUT=$(BUILDDIR)/libm4a.a | 201 | $(SILENT)$(MAKE) -C libm4a OBJDIR=$(OBJDIR)/libm4a OUTPUT=$(BUILDDIR)/libm4a.a |
187 | 202 | ||
203 | $(BUILDDIR)/libfaad.a: libfaad | ||
204 | |||
188 | libfaad: | 205 | libfaad: |
189 | @echo "MAKE in libfaad" | 206 | @echo "MAKE in libfaad" |
190 | $(SILENT)mkdir -p $(OBJDIR)/libfaad | 207 | $(SILENT)mkdir -p $(OBJDIR)/libfaad |
diff --git a/apps/codecs/Tremor/Makefile b/apps/codecs/Tremor/Makefile index ecd4ac9478..881329d7c1 100644 --- a/apps/codecs/Tremor/Makefile +++ b/apps/codecs/Tremor/Makefile | |||
@@ -15,8 +15,8 @@ ifdef APPEXTRA | |||
15 | endif | 15 | endif |
16 | 16 | ||
17 | TREMOROPTS = -O2 | 17 | TREMOROPTS = -O2 |
18 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TREMOROPTS) $(TARGET) $(EXTRA_DEFINES) \ | 18 | CFLAGS = $(INCLUDES) $(GCCOPTS) $(TARGET_INC) $(TREMOROPTS) $(TARGET) \ |
19 | -DMEM=${MEMORYSIZE} ${PROFILE_OPTS} | 19 | $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} ${PROFILE_OPTS} |
20 | 20 | ||
21 | # This sets up 'SRC' based on the files mentioned in SOURCES | 21 | # This sets up 'SRC' based on the files mentioned in SOURCES |
22 | include $(TOOLSDIR)/makesrc.inc | 22 | include $(TOOLSDIR)/makesrc.inc |