diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/FILES | 2 | ||||
-rw-r--r-- | apps/Makefile | 25 | ||||
-rw-r--r-- | apps/bitmaps/Makefile | 34 | ||||
-rw-r--r-- | apps/plugins/Makefile | 5 | ||||
-rw-r--r-- | apps/plugins/bitmaps/Makefile | 34 |
5 files changed, 78 insertions, 22 deletions
diff --git a/apps/FILES b/apps/FILES index 279b35549b..61eb9ffba9 100644 --- a/apps/FILES +++ b/apps/FILES | |||
@@ -11,6 +11,7 @@ bitmaps/mono/* | |||
11 | bitmaps/native/* | 11 | bitmaps/native/* |
12 | bitmaps/remote_mono/* | 12 | bitmaps/remote_mono/* |
13 | bitmaps/remote_native/* | 13 | bitmaps/remote_native/* |
14 | bitmaps/Makefile | ||
14 | plugins/*.[ch] | 15 | plugins/*.[ch] |
15 | plugins/*.pl | 16 | plugins/*.pl |
16 | plugins/Makefile | 17 | plugins/Makefile |
@@ -21,6 +22,7 @@ plugins/bitmaps/mono/* | |||
21 | plugins/bitmaps/native/* | 22 | plugins/bitmaps/native/* |
22 | plugins/bitmaps/remote_mono/* | 23 | plugins/bitmaps/remote_mono/* |
23 | plugins/bitmaps/remote_native/* | 24 | plugins/bitmaps/remote_native/* |
25 | plugins/bitmaps/Makefile | ||
24 | plugins/sokoban.levels | 26 | plugins/sokoban.levels |
25 | plugins/viewers.config | 27 | plugins/viewers.config |
26 | plugins/snake2.levels | 28 | plugins/snake2.levels |
diff --git a/apps/Makefile b/apps/Makefile index 1f9ab284fa..e3711f0a34 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -69,7 +69,7 @@ LIBROCKBOX = $(BUILDDIR)/librockbox.a | |||
69 | ifdef SIMVER | 69 | ifdef SIMVER |
70 | # this is a sim build | 70 | # this is a sim build |
71 | 71 | ||
72 | all: $(BITMAPLIBS) $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) | 72 | all: build-bitmaps $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) |
73 | 73 | ||
74 | else | 74 | else |
75 | # regular target build | 75 | # regular target build |
@@ -79,7 +79,7 @@ ifndef DEBUG | |||
79 | REALBIN = $(BUILDDIR)/$(BINARY) | 79 | REALBIN = $(BUILDDIR)/$(BINARY) |
80 | endif | 80 | endif |
81 | 81 | ||
82 | all: $(BITMAPLIBS) $(REALBIN) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM) | 82 | all: build-bitmaps $(REALBIN) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM) |
83 | endif | 83 | endif |
84 | 84 | ||
85 | dep: $(DEPFILE) | 85 | dep: $(DEPFILE) |
@@ -88,25 +88,8 @@ build-codecs: | |||
88 | @$(MAKE) -C codecs/lib OBJDIR=$(OBJDIR)/codecs/lib | 88 | @$(MAKE) -C codecs/lib OBJDIR=$(OBJDIR)/codecs/lib |
89 | @$(MAKE) -C codecs OBJDIR=$(OBJDIR)/codecs | 89 | @$(MAKE) -C codecs OBJDIR=$(OBJDIR)/codecs |
90 | 90 | ||
91 | $(BUILDDIR)/libbitmapsnative.a: | 91 | build-bitmaps: |
92 | @echo "MAKE in bitmaps/native" | 92 | @$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps |
93 | $(SILENT)mkdir -p $(OBJDIR)/bitmaps/native | ||
94 | @$(MAKE) -C bitmaps/native OBJDIR=$(OBJDIR)/bitmaps/native | ||
95 | |||
96 | $(BUILDDIR)/libbitmapsmono.a: | ||
97 | @echo "MAKE in bitmaps/mono" | ||
98 | $(SILENT)mkdir -p $(OBJDIR)/bitmaps/mono | ||
99 | @$(MAKE) -C bitmaps/mono OBJDIR=$(OBJDIR)/bitmaps/mono | ||
100 | |||
101 | $(BUILDDIR)/libbitmapsremotenative.a: | ||
102 | @echo "MAKE in bitmaps/remote_native" | ||
103 | $(SILENT)mkdir -p $(OBJDIR)/bitmaps/remote_native | ||
104 | @$(MAKE) -C bitmaps/remote_native OBJDIR=$(OBJDIR)/bitmaps/remote_native | ||
105 | |||
106 | $(BUILDDIR)/libbitmapsremotemono.a: | ||
107 | @echo "MAKE in bitmaps/remote_mono" | ||
108 | $(SILENT)mkdir -p $(OBJDIR)/bitmaps/remote_mono | ||
109 | @$(MAKE) -C bitmaps/remote_mono OBJDIR=$(OBJDIR)/bitmaps/remote_mono | ||
110 | 93 | ||
111 | rocks: | 94 | rocks: |
112 | @$(MAKE) -C plugins/lib OBJDIR=$(OBJDIR)/plugins/lib | 95 | @$(MAKE) -C plugins/lib OBJDIR=$(OBJDIR)/plugins/lib |
diff --git a/apps/bitmaps/Makefile b/apps/bitmaps/Makefile new file mode 100644 index 0000000000..aa43615894 --- /dev/null +++ b/apps/bitmaps/Makefile | |||
@@ -0,0 +1,34 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | # $Id$ | ||
8 | # | ||
9 | |||
10 | ifndef V | ||
11 | SILENT=@ | ||
12 | endif | ||
13 | |||
14 | all: | ||
15 | ifneq ($(strip $(BMP2RB_NATIVE)),) | ||
16 | @echo "MAKE in bitmaps/native" | ||
17 | $(SILENT)mkdir -p $(OBJDIR)/native | ||
18 | @$(MAKE) -C native OBJDIR=$(OBJDIR)/native | ||
19 | endif | ||
20 | ifneq ($(strip $(BMP2RB_MONO)),) | ||
21 | @echo "MAKE in bitmaps/mono" | ||
22 | $(SILENT)mkdir -p $(OBJDIR)/mono | ||
23 | @$(MAKE) -C mono OBJDIR=$(OBJDIR)/mono | ||
24 | endif | ||
25 | ifneq ($(strip $(BMP2RB_REMOTENATIVE)),) | ||
26 | @echo "MAKE in bitmaps/remote_native" | ||
27 | $(SILENT)mkdir -p $(OBJDIR)/remote_native | ||
28 | @$(MAKE) -C remote_native OBJDIR=$(OBJDIR)/remote_native | ||
29 | endif | ||
30 | ifneq ($(strip $(BMP2RB_REMOTEMONO)),) | ||
31 | @echo "MAKE in bitmaps/remote_mono" | ||
32 | $(SILENT)mkdir -p $(OBJDIR)/remote_mono | ||
33 | @$(MAKE) -C remote_mono OBJDIR=$(OBJDIR)/remote_mono | ||
34 | endif | ||
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 51d6b63c21..adc956f8d2 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile | |||
@@ -70,7 +70,7 @@ endif | |||
70 | 70 | ||
71 | 71 | ||
72 | .PHONY: $(SUBDIRS) | 72 | .PHONY: $(SUBDIRS) |
73 | all: $(BITMAPLIBS) $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) | 73 | all: build-bitmaps $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) |
74 | 74 | ||
75 | $(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS | 75 | $(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS |
76 | @echo "create credits.raw" | 76 | @echo "create credits.raw" |
@@ -81,6 +81,9 @@ $(OBJDIR)/credits.o: credits.c $(BUILDDIR)/credits.raw | |||
81 | @echo "CC $<" | 81 | @echo "CC $<" |
82 | @$(CC) $(CFLAGS) -I$(OBJDIR) -c $< -o $@ | 82 | @$(CC) $(CFLAGS) -I$(OBJDIR) -c $< -o $@ |
83 | 83 | ||
84 | build-bitmaps: | ||
85 | @$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps | ||
86 | |||
84 | ifndef SIMVER | 87 | ifndef SIMVER |
85 | $(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE) $(BUILDDIR)/libplugin.a $(BITMAPLIBS) | 88 | $(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE) $(BUILDDIR)/libplugin.a $(BITMAPLIBS) |
86 | $(SILENT)(file=`basename $@`; \ | 89 | $(SILENT)(file=`basename $@`; \ |
diff --git a/apps/plugins/bitmaps/Makefile b/apps/plugins/bitmaps/Makefile new file mode 100644 index 0000000000..abc8fd66bf --- /dev/null +++ b/apps/plugins/bitmaps/Makefile | |||
@@ -0,0 +1,34 @@ | |||
1 | # __________ __ ___. | ||
2 | # Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
3 | # Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
4 | # Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
5 | # Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
6 | # \/ \/ \/ \/ \/ | ||
7 | # $Id$ | ||
8 | # | ||
9 | |||
10 | ifndef V | ||
11 | SILENT=@ | ||
12 | endif | ||
13 | |||
14 | all: | ||
15 | ifneq ($(strip $(BMP2RB_NATIVE)),) | ||
16 | @echo "MAKE in plugins/bitmaps/native" | ||
17 | $(SILENT)mkdir -p $(OBJDIR)/native | ||
18 | @$(MAKE) -C native OBJDIR=$(OBJDIR)/native | ||
19 | endif | ||
20 | ifneq ($(strip $(BMP2RB_MONO)),) | ||
21 | @echo "MAKE in plugins/bitmaps/mono" | ||
22 | $(SILENT)mkdir -p $(OBJDIR)/mono | ||
23 | @$(MAKE) -C mono OBJDIR=$(OBJDIR)/mono | ||
24 | endif | ||
25 | ifneq ($(strip $(BMP2RB_REMOTENATIVE)),) | ||
26 | @echo "MAKE in plugins/bitmaps/remote_native" | ||
27 | $(SILENT)mkdir -p $(OBJDIR)/remote_native | ||
28 | @$(MAKE) -C remote_native OBJDIR=$(OBJDIR)/remote_native | ||
29 | endif | ||
30 | ifneq ($(strip $(BMP2RB_REMOTEMONO)),) | ||
31 | @echo "MAKE in plugins/bitmaps/remote_mono" | ||
32 | $(SILENT)mkdir -p $(OBJDIR)/remote_mono | ||
33 | @$(MAKE) -C remote_mono OBJDIR=$(OBJDIR)/remote_mono | ||
34 | endif | ||