summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-08-15 11:35:14 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-08-15 11:35:14 +0000
commit134c45d7091d8c429acd87ca1eb692b7147556a9 (patch)
tree643ec55e50a73362f876519f1264a68412cf4fff
parentdd2bae49ebfbe44bf91c8444bc74ffaa600f8ae1 (diff)
downloadrockbox-134c45d7091d8c429acd87ca1eb692b7147556a9.zip
rockbox-134c45d7091d8c429acd87ca1eb692b7147556a9.tar.gz
rockbox-134c45d7091d8c429acd87ca1eb692b7147556a9.tar.bz2
rockbox-134c45d7091d8c429acd87ca1eb692b7147556a9.tar.xz
Fixed font target for loadable fonts
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1759 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/firmware/Makefile b/firmware/Makefile
index 01242ff..03576d1 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -43,11 +43,13 @@ DIRS = $(subst $(DEPS),".",$(DEPDIRS))
OUTPUT = $(OBJDIR)/librockbox.a
-ifdef LOADABLE_FONTS
+ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(CFLAGS)))
EXTRA_TARGETS = $(OBJDIR)/system.ajf
endif
-$(OUTPUT): $(OBJS) $(EXTRA_TARGETS)
+all: $(OUTPUT) $(EXTRA_TARGETS)
+
+$(OUTPUT): $(OBJS)
$(AR) ruv $@ $+
$(OBJDIR)/%.o: %.c
@@ -58,7 +60,7 @@ $(OBJDIR)/%.o: %.S
@mkdir -p `dirname $@`
$(CC) $(CFLAGS) -c $< -o $@
-$(OBJDIR)/system.ajf: ../tools/bdf2ajf $(SYSTEM_FONT)
+$(OBJDIR)/system.ajf: $(SYSTEM_FONT)
../tools/bdf2ajf -f $(SYSTEM_FONT) -o $(OBJDIR)/system.ajf
tags: