diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2002-08-15 11:35:14 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2002-08-15 11:35:14 +0000 |
| commit | 134c45d7091d8c429acd87ca1eb692b7147556a9 (patch) | |
| tree | 643ec55e50a73362f876519f1264a68412cf4fff /firmware/Makefile | |
| parent | dd2bae49ebfbe44bf91c8444bc74ffaa600f8ae1 (diff) | |
| download | rockbox-134c45d7091d8c429acd87ca1eb692b7147556a9.tar.gz rockbox-134c45d7091d8c429acd87ca1eb692b7147556a9.zip | |
Fixed font target for loadable fonts
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1759 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/Makefile')
| -rw-r--r-- | firmware/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index 01242ff159..03576d19fd 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
| @@ -43,11 +43,13 @@ DIRS = $(subst $(DEPS),".",$(DEPDIRS)) | |||
| 43 | 43 | ||
| 44 | OUTPUT = $(OBJDIR)/librockbox.a | 44 | OUTPUT = $(OBJDIR)/librockbox.a |
| 45 | 45 | ||
| 46 | ifdef LOADABLE_FONTS | 46 | ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(CFLAGS))) |
| 47 | EXTRA_TARGETS = $(OBJDIR)/system.ajf | 47 | EXTRA_TARGETS = $(OBJDIR)/system.ajf |
| 48 | endif | 48 | endif |
| 49 | 49 | ||
| 50 | $(OUTPUT): $(OBJS) $(EXTRA_TARGETS) | 50 | all: $(OUTPUT) $(EXTRA_TARGETS) |
| 51 | |||
| 52 | $(OUTPUT): $(OBJS) | ||
| 51 | $(AR) ruv $@ $+ | 53 | $(AR) ruv $@ $+ |
| 52 | 54 | ||
| 53 | $(OBJDIR)/%.o: %.c | 55 | $(OBJDIR)/%.o: %.c |
| @@ -58,7 +60,7 @@ $(OBJDIR)/%.o: %.S | |||
| 58 | @mkdir -p `dirname $@` | 60 | @mkdir -p `dirname $@` |
| 59 | $(CC) $(CFLAGS) -c $< -o $@ | 61 | $(CC) $(CFLAGS) -c $< -o $@ |
| 60 | 62 | ||
| 61 | $(OBJDIR)/system.ajf: ../tools/bdf2ajf $(SYSTEM_FONT) | 63 | $(OBJDIR)/system.ajf: $(SYSTEM_FONT) |
| 62 | ../tools/bdf2ajf -f $(SYSTEM_FONT) -o $(OBJDIR)/system.ajf | 64 | ../tools/bdf2ajf -f $(SYSTEM_FONT) -o $(OBJDIR)/system.ajf |
| 63 | 65 | ||
| 64 | tags: | 66 | tags: |