diff options
author | Daniel Stenberg <daniel@haxx.se> | 2004-10-07 08:20:25 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2004-10-07 08:20:25 +0000 |
commit | 59bec2eaa06025fc9cc056318e60ba0c7ba208ff (patch) | |
tree | 88e1e39ca1863a5ef33b2e486d555aee6b7f3ad1 | |
parent | a97fe2514d505cb4d55b73ac86367f0fb8cf8ba8 (diff) | |
download | rockbox-59bec2eaa06025fc9cc056318e60ba0c7ba208ff.tar.gz rockbox-59bec2eaa06025fc9cc056318e60ba0c7ba208ff.zip |
don't build UCL files for targets that don't support flashing
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5204 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/Makefile | 7 | ||||
-rwxr-xr-x | tools/configure | 9 |
2 files changed, 11 insertions, 5 deletions
diff --git a/apps/Makefile b/apps/Makefile index 12d4c85fd9..9dee7cbcca 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -21,9 +21,6 @@ endif | |||
21 | SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - ) | 21 | SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - ) |
22 | DIRS = . | 22 | DIRS = . |
23 | 23 | ||
24 | # set the ROMTARGET here | ||
25 | ROMTARGET := $(ARCHOSROM) | ||
26 | |||
27 | ifdef APPEXTRA | 24 | ifdef APPEXTRA |
28 | DIRS += $(APPEXTRA) | 25 | DIRS += $(APPEXTRA) |
29 | INCLUDES += -I$(APPEXTRA) | 26 | INCLUDES += -I$(APPEXTRA) |
@@ -42,7 +39,7 @@ MAXOUTFILE = $(OBJDIR)/romstart | |||
42 | ifdef DEBUG | 39 | ifdef DEBUG |
43 | all: $(OBJDIR)/rockbox.elf rocks | 40 | all: $(OBJDIR)/rockbox.elf rocks |
44 | else | 41 | else |
45 | all: $(OBJDIR)/$(BINARY) $(OBJDIR)/rockbox.ucl rocks $(ROMTARGET) | 42 | all: $(OBJDIR)/$(BINARY) $(FLASHFILE) rocks $(ARCHOSROM) |
46 | endif | 43 | endif |
47 | 44 | ||
48 | dep: $(DEPFILE) | 45 | dep: $(DEPFILE) |
@@ -101,7 +98,7 @@ $(OBJDIR)/rockbox.ucl: $(OBJDIR)/rockbox.bin | |||
101 | echo "fake" > $@; \ | 98 | echo "fake" > $@; \ |
102 | fi | 99 | fi |
103 | 100 | ||
104 | $(ARCHOSROM): $(OBJDIR)/rombox.bin $(MAXOUTFILE) | 101 | $(OBJDIR)/rombox.ucl: $(OBJDIR)/rombox.bin $(MAXOUTFILE) |
105 | @a=`uclpack -h 2>/dev/null`; \ | 102 | @a=`uclpack -h 2>/dev/null`; \ |
106 | if test -n "$$a"; then \ | 103 | if test -n "$$a"; then \ |
107 | echo "UCLPACK rombox" ; \ | 104 | echo "UCLPACK rombox" ; \ |
diff --git a/tools/configure b/tools/configure index dd60bb825b..a7f4b9ce24 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -269,6 +269,7 @@ if [ -z "$archos" ]; then | |||
269 | output="archos.mod" | 269 | output="archos.mod" |
270 | appextra="player" | 270 | appextra="player" |
271 | archosrom="" | 271 | archosrom="" |
272 | flash="" | ||
272 | plugins="yes" | 273 | plugins="yes" |
273 | ;; | 274 | ;; |
274 | 275 | ||
@@ -280,6 +281,7 @@ if [ -z "$archos" ]; then | |||
280 | output="ajbrec.ajz" | 281 | output="ajbrec.ajz" |
281 | appextra="recorder" | 282 | appextra="recorder" |
282 | archosrom="$pwd/rombox.ucl" | 283 | archosrom="$pwd/rombox.ucl" |
284 | flash="$pwd/rockbox.ucl" | ||
283 | plugins="yes" | 285 | plugins="yes" |
284 | ;; | 286 | ;; |
285 | 287 | ||
@@ -291,6 +293,7 @@ if [ -z "$archos" ]; then | |||
291 | output="ajbrec.ajz" | 293 | output="ajbrec.ajz" |
292 | appextra="recorder" | 294 | appextra="recorder" |
293 | archosrom="$pwd/rombox.ucl" | 295 | archosrom="$pwd/rombox.ucl" |
296 | flash="$pwd/rockbox.ucl" | ||
294 | plugins="yes" | 297 | plugins="yes" |
295 | ;; | 298 | ;; |
296 | 299 | ||
@@ -302,6 +305,7 @@ if [ -z "$archos" ]; then | |||
302 | output="ajbrec.ajz" | 305 | output="ajbrec.ajz" |
303 | appextra="recorder" | 306 | appextra="recorder" |
304 | archosrom="$pwd/rombox.ucl" | 307 | archosrom="$pwd/rombox.ucl" |
308 | flash="$pwd/rockbox.ucl" | ||
305 | plugins="yes" | 309 | plugins="yes" |
306 | ;; | 310 | ;; |
307 | 311 | ||
@@ -313,6 +317,7 @@ if [ -z "$archos" ]; then | |||
313 | output="ajbrec.ajz" | 317 | output="ajbrec.ajz" |
314 | appextra="recorder" | 318 | appextra="recorder" |
315 | archosrom="$pwd/rombox.ucl" | 319 | archosrom="$pwd/rombox.ucl" |
320 | flash="$pwd/rockbox.ucl" | ||
316 | plugins="yes" | 321 | plugins="yes" |
317 | ;; | 322 | ;; |
318 | 323 | ||
@@ -325,6 +330,7 @@ if [ -z "$archos" ]; then | |||
325 | output="rockbox.iriver" | 330 | output="rockbox.iriver" |
326 | appextra="" | 331 | appextra="" |
327 | archosrom="" | 332 | archosrom="" |
333 | flash="" | ||
328 | plugins="yes" | 334 | plugins="yes" |
329 | ;; | 335 | ;; |
330 | 336 | ||
@@ -336,6 +342,7 @@ if [ -z "$archos" ]; then | |||
336 | output="ajbrec.ajz" | 342 | output="ajbrec.ajz" |
337 | appextra="recorder" | 343 | appextra="recorder" |
338 | archosrom="$pwd/rombox.ucl" | 344 | archosrom="$pwd/rombox.ucl" |
345 | flash="$pwd/rockbox.ucl" | ||
339 | plugins="yes" | 346 | plugins="yes" |
340 | ;; | 347 | ;; |
341 | 348 | ||
@@ -431,6 +438,7 @@ sed > Makefile \ | |||
431 | -e "s,@OUTPUT@,${output},g" \ | 438 | -e "s,@OUTPUT@,${output},g" \ |
432 | -e "s,@APPEXTRA@,${appextra},g" \ | 439 | -e "s,@APPEXTRA@,${appextra},g" \ |
433 | -e "s,@ARCHOSROM@,${archosrom},g" \ | 440 | -e "s,@ARCHOSROM@,${archosrom},g" \ |
441 | -e "s,@FLASHFILE@,${flash},g" \ | ||
434 | -e "s,@PLUGINS@,${plugins},g" \ | 442 | -e "s,@PLUGINS@,${plugins},g" \ |
435 | -e "s,@GCCOPTS@,${GCCOPTS},g" \ | 443 | -e "s,@GCCOPTS@,${GCCOPTS},g" \ |
436 | <<EOF | 444 | <<EOF |
@@ -444,6 +452,7 @@ export DOCSDIR=\$(ROOTDIR)/docs | |||
444 | export DEBUG=@DEBUG@ | 452 | export DEBUG=@DEBUG@ |
445 | export ARCHOS=@ARCHOS@ | 453 | export ARCHOS=@ARCHOS@ |
446 | export ARCHOSROM=@ARCHOSROM@ | 454 | export ARCHOSROM=@ARCHOSROM@ |
455 | export FLASHFILE=@FLASHFILE@ | ||
447 | export TARGET=@TARGET@ | 456 | export TARGET=@TARGET@ |
448 | export OBJDIR=@PWD@ | 457 | export OBJDIR=@PWD@ |
449 | export LANGUAGE=@LANGUAGE@ | 458 | export LANGUAGE=@LANGUAGE@ |