diff options
| -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/* bitmaps/native/* bitmaps/remote_mono/* bitmaps/remote_native/* +bitmaps/Makefile plugins/*.[ch] plugins/*.pl plugins/Makefile @@ -21,6 +22,7 @@ plugins/bitmaps/mono/* plugins/bitmaps/native/* plugins/bitmaps/remote_mono/* plugins/bitmaps/remote_native/* +plugins/bitmaps/Makefile plugins/sokoban.levels plugins/viewers.config 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 ifdef SIMVER # this is a sim build -all: $(BITMAPLIBS) $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) +all: build-bitmaps $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) else # regular target build @@ -79,7 +79,7 @@ ifndef DEBUG REALBIN = $(BUILDDIR)/$(BINARY) endif -all: $(BITMAPLIBS) $(REALBIN) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM) +all: build-bitmaps $(REALBIN) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM) endif dep: $(DEPFILE) @@ -88,25 +88,8 @@ build-codecs: @$(MAKE) -C codecs/lib OBJDIR=$(OBJDIR)/codecs/lib @$(MAKE) -C codecs OBJDIR=$(OBJDIR)/codecs -$(BUILDDIR)/libbitmapsnative.a: - @echo "MAKE in bitmaps/native" - $(SILENT)mkdir -p $(OBJDIR)/bitmaps/native - @$(MAKE) -C bitmaps/native OBJDIR=$(OBJDIR)/bitmaps/native - -$(BUILDDIR)/libbitmapsmono.a: - @echo "MAKE in bitmaps/mono" - $(SILENT)mkdir -p $(OBJDIR)/bitmaps/mono - @$(MAKE) -C bitmaps/mono OBJDIR=$(OBJDIR)/bitmaps/mono - -$(BUILDDIR)/libbitmapsremotenative.a: - @echo "MAKE in bitmaps/remote_native" - $(SILENT)mkdir -p $(OBJDIR)/bitmaps/remote_native - @$(MAKE) -C bitmaps/remote_native OBJDIR=$(OBJDIR)/bitmaps/remote_native - -$(BUILDDIR)/libbitmapsremotemono.a: - @echo "MAKE in bitmaps/remote_mono" - $(SILENT)mkdir -p $(OBJDIR)/bitmaps/remote_mono - @$(MAKE) -C bitmaps/remote_mono OBJDIR=$(OBJDIR)/bitmaps/remote_mono +build-bitmaps: + @$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps rocks: @$(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 @@ +# __________ __ ___. +# Open \______ \ ____ ____ | | _\_ |__ _______ ___ +# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / +# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < +# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ +# \/ \/ \/ \/ \/ +# $Id$ +# + +ifndef V +SILENT=@ +endif + +all: +ifneq ($(strip $(BMP2RB_NATIVE)),) + @echo "MAKE in bitmaps/native" + $(SILENT)mkdir -p $(OBJDIR)/native + @$(MAKE) -C native OBJDIR=$(OBJDIR)/native +endif +ifneq ($(strip $(BMP2RB_MONO)),) + @echo "MAKE in bitmaps/mono" + $(SILENT)mkdir -p $(OBJDIR)/mono + @$(MAKE) -C mono OBJDIR=$(OBJDIR)/mono +endif +ifneq ($(strip $(BMP2RB_REMOTENATIVE)),) + @echo "MAKE in bitmaps/remote_native" + $(SILENT)mkdir -p $(OBJDIR)/remote_native + @$(MAKE) -C remote_native OBJDIR=$(OBJDIR)/remote_native +endif +ifneq ($(strip $(BMP2RB_REMOTEMONO)),) + @echo "MAKE in bitmaps/remote_mono" + $(SILENT)mkdir -p $(OBJDIR)/remote_mono + @$(MAKE) -C remote_mono OBJDIR=$(OBJDIR)/remote_mono +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 .PHONY: $(SUBDIRS) -all: $(BITMAPLIBS) $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) +all: build-bitmaps $(BUILDDIR)/libplugin.a $(ROCKS) $(SUBDIRS) $(DEPFILE) $(BUILDDIR)/credits.raw: $(DOCSDIR)/CREDITS @echo "create credits.raw" @@ -81,6 +81,9 @@ $(OBJDIR)/credits.o: credits.c $(BUILDDIR)/credits.raw @echo "CC $<" @$(CC) $(CFLAGS) -I$(OBJDIR) -c $< -o $@ +build-bitmaps: + @$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps + ifndef SIMVER $(OBJDIR)/%.elf: $(OBJDIR)/%.o $(LINKFILE) $(BUILDDIR)/libplugin.a $(BITMAPLIBS) $(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 @@ +# __________ __ ___. +# Open \______ \ ____ ____ | | _\_ |__ _______ ___ +# Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / +# Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < +# Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ +# \/ \/ \/ \/ \/ +# $Id$ +# + +ifndef V +SILENT=@ +endif + +all: +ifneq ($(strip $(BMP2RB_NATIVE)),) + @echo "MAKE in plugins/bitmaps/native" + $(SILENT)mkdir -p $(OBJDIR)/native + @$(MAKE) -C native OBJDIR=$(OBJDIR)/native +endif +ifneq ($(strip $(BMP2RB_MONO)),) + @echo "MAKE in plugins/bitmaps/mono" + $(SILENT)mkdir -p $(OBJDIR)/mono + @$(MAKE) -C mono OBJDIR=$(OBJDIR)/mono +endif +ifneq ($(strip $(BMP2RB_REMOTENATIVE)),) + @echo "MAKE in plugins/bitmaps/remote_native" + $(SILENT)mkdir -p $(OBJDIR)/remote_native + @$(MAKE) -C remote_native OBJDIR=$(OBJDIR)/remote_native +endif +ifneq ($(strip $(BMP2RB_REMOTEMONO)),) + @echo "MAKE in plugins/bitmaps/remote_mono" + $(SILENT)mkdir -p $(OBJDIR)/remote_mono + @$(MAKE) -C remote_mono OBJDIR=$(OBJDIR)/remote_mono +endif |