diff options
Diffstat (limited to 'firmware/Makefile')
-rw-r--r-- | firmware/Makefile | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/firmware/Makefile b/firmware/Makefile index a858edfe7c..7211b3775f 100644 --- a/firmware/Makefile +++ b/firmware/Makefile | |||
@@ -7,7 +7,7 @@ | |||
7 | # $Id$ | 7 | # $Id$ |
8 | # | 8 | # |
9 | 9 | ||
10 | INCLUDES=-Iinclude -I$(FIRMDIR) -Iexport -Icommon -Idrivers | 10 | INCLUDES=-Iinclude -I$(FIRMDIR) -Iexport -Icommon -Idrivers -I$(BUILDDIR) |
11 | 11 | ||
12 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} | 12 | CFLAGS = $(GCCOPTS) $(INCLUDES) $(TARGET) $(EXTRA_DEFINES) -DMEM=${MEMORYSIZE} |
13 | 13 | ||
@@ -18,18 +18,15 @@ SOURCES = $(SRC) | |||
18 | OBJS2 := $(patsubst %.c, $(OBJDIR)/%.o, $(SRC)) $(OBJDIR)/sysfont.o | 18 | OBJS2 := $(patsubst %.c, $(OBJDIR)/%.o, $(SRC)) $(OBJDIR)/sysfont.o |
19 | OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) | 19 | OBJS = $(patsubst %.S, $(OBJDIR)/%.o, $(OBJS2)) |
20 | DIRS:=. drivers common | 20 | DIRS:=. drivers common |
21 | OUTPUT = $(OBJDIR)/librockbox.a | 21 | OUTPUT = $(BUILDDIR)/librockbox.a |
22 | DEPFILE = $(OBJDIR)/dep-firmware | 22 | DEPFILE = $(OBJDIR)/dep-firmware |
23 | 23 | ||
24 | all: $(TOOLSDIR)/convbdf $(OUTPUT) $(EXTRA_TARGETS) | 24 | all: $(OUTPUT) $(EXTRA_TARGETS) |
25 | 25 | ||
26 | dep: $(DEPFILE) | 26 | dep: $(DEPFILE) |
27 | 27 | ||
28 | $(TOOLSDIR)/convbdf: | ||
29 | $(MAKE) CC=gcc LD=ld -C $(TOOLSDIR) | ||
30 | |||
31 | $(OUTPUT): $(OBJS) $(DEPFILE) | 28 | $(OUTPUT): $(OBJS) $(DEPFILE) |
32 | @echo "AR $@" | 29 | @echo "AR+RANLIB $@" |
33 | @$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 | 30 | @$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 |
34 | @$(RANLIB) $@ | 31 | @$(RANLIB) $@ |
35 | 32 | ||
@@ -42,13 +39,13 @@ clean: | |||
42 | 39 | ||
43 | # Special targets | 40 | # Special targets |
44 | $(OBJDIR)/thread.o: thread.c export/thread.h | 41 | $(OBJDIR)/thread.o: thread.c export/thread.h |
45 | @echo "CC thread.c" | 42 | $(SILENT)echo "CC thread.c" |
46 | @$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@ | 43 | $(SILENT)$(CC) -c -O -fomit-frame-pointer $(CFLAGS) $< -o $@ |
47 | 44 | ||
48 | $(OBJDIR)/sysfont.o: fonts/clR6x8.bdf | 45 | $(OBJDIR)/sysfont.o: fonts/clR6x8.bdf |
49 | @echo "CONVBDF" | 46 | @echo "CONVBDF" |
50 | @$(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $< | 47 | $(SILENT)$(TOOLSDIR)/convbdf -c -o $(OBJDIR)/sysfont.c $< |
51 | @echo "CC sysfont.c" | 48 | @echo "CC sysfont.c" |
52 | @$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@ | 49 | $(SILENT)$(CC) $(CFLAGS) -c $(OBJDIR)/sysfont.c -o $@ |
53 | 50 | ||
54 | -include $(DEPFILE) | 51 | -include $(DEPFILE) |