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.zip rockbox-59bec2eaa06025fc9cc056318e60ba0c7ba208ff.tar.gz rockbox-59bec2eaa06025fc9cc056318e60ba0c7ba208ff.tar.bz2 rockbox-59bec2eaa06025fc9cc056318e60ba0c7ba208ff.tar.xz | |
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 12d4c85..9dee7cb 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -21,9 +21,6 @@ endif SRC := $(shell cat SOURCES | $(CC) -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) $(TARGET) $(DEFINES) -E -P -include "config.h" - ) DIRS = . -# set the ROMTARGET here -ROMTARGET := $(ARCHOSROM) - ifdef APPEXTRA DIRS += $(APPEXTRA) INCLUDES += -I$(APPEXTRA) @@ -42,7 +39,7 @@ MAXOUTFILE = $(OBJDIR)/romstart ifdef DEBUG all: $(OBJDIR)/rockbox.elf rocks else -all: $(OBJDIR)/$(BINARY) $(OBJDIR)/rockbox.ucl rocks $(ROMTARGET) +all: $(OBJDIR)/$(BINARY) $(FLASHFILE) rocks $(ARCHOSROM) endif dep: $(DEPFILE) @@ -101,7 +98,7 @@ $(OBJDIR)/rockbox.ucl: $(OBJDIR)/rockbox.bin echo "fake" > $@; \ fi -$(ARCHOSROM): $(OBJDIR)/rombox.bin $(MAXOUTFILE) +$(OBJDIR)/rombox.ucl: $(OBJDIR)/rombox.bin $(MAXOUTFILE) @a=`uclpack -h 2>/dev/null`; \ if test -n "$$a"; then \ echo "UCLPACK rombox" ; \ diff --git a/tools/configure b/tools/configure index dd60bb8..a7f4b9c 100755 --- a/tools/configure +++ b/tools/configure @@ -269,6 +269,7 @@ if [ -z "$archos" ]; then output="archos.mod" appextra="player" archosrom="" + flash="" plugins="yes" ;; @@ -280,6 +281,7 @@ if [ -z "$archos" ]; then output="ajbrec.ajz" appextra="recorder" archosrom="$pwd/rombox.ucl" + flash="$pwd/rockbox.ucl" plugins="yes" ;; @@ -291,6 +293,7 @@ if [ -z "$archos" ]; then output="ajbrec.ajz" appextra="recorder" archosrom="$pwd/rombox.ucl" + flash="$pwd/rockbox.ucl" plugins="yes" ;; @@ -302,6 +305,7 @@ if [ -z "$archos" ]; then output="ajbrec.ajz" appextra="recorder" archosrom="$pwd/rombox.ucl" + flash="$pwd/rockbox.ucl" plugins="yes" ;; @@ -313,6 +317,7 @@ if [ -z "$archos" ]; then output="ajbrec.ajz" appextra="recorder" archosrom="$pwd/rombox.ucl" + flash="$pwd/rockbox.ucl" plugins="yes" ;; @@ -325,6 +330,7 @@ if [ -z "$archos" ]; then output="rockbox.iriver" appextra="" archosrom="" + flash="" plugins="yes" ;; @@ -336,6 +342,7 @@ if [ -z "$archos" ]; then output="ajbrec.ajz" appextra="recorder" archosrom="$pwd/rombox.ucl" + flash="$pwd/rockbox.ucl" plugins="yes" ;; @@ -431,6 +438,7 @@ sed > Makefile \ -e "s,@OUTPUT@,${output},g" \ -e "s,@APPEXTRA@,${appextra},g" \ -e "s,@ARCHOSROM@,${archosrom},g" \ + -e "s,@FLASHFILE@,${flash},g" \ -e "s,@PLUGINS@,${plugins},g" \ -e "s,@GCCOPTS@,${GCCOPTS},g" \ <<EOF @@ -444,6 +452,7 @@ export DOCSDIR=\$(ROOTDIR)/docs export DEBUG=@DEBUG@ export ARCHOS=@ARCHOS@ export ARCHOSROM=@ARCHOSROM@ +export FLASHFILE=@FLASHFILE@ export TARGET=@TARGET@ export OBJDIR=@PWD@ export LANGUAGE=@LANGUAGE@ |