diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2006-01-26 11:57:53 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2006-01-26 11:57:53 +0000 |
| commit | 751d199587967b9b01c84a3f3185c4c786e81742 (patch) | |
| tree | 772db515bed21446b7e049c95f6a9867df1717c0 /apps/plugins | |
| parent | 4a6b2c5a69d2c6877c06d1a4562c24b1592033eb (diff) | |
| download | rockbox-751d199587967b9b01c84a3f3185c4c786e81742.zip rockbox-751d199587967b9b01c84a3f3185c4c786e81742.tar.gz rockbox-751d199587967b9b01c84a3f3185c4c786e81742.tar.bz2 rockbox-751d199587967b9b01c84a3f3185c4c786e81742.tar.xz | |
Adjusted the bitmap build to run make in the bitmap directories
unconditionally to better detect updated dependencies. Previously, new files
and modified images were not properly detected and didn't cause rebuilds.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8457 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/Makefile | 5 | ||||
| -rw-r--r-- | apps/plugins/bitmaps/Makefile | 34 |
2 files changed, 38 insertions, 1 deletions
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 51d6b63..adc956f 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 0000000..abc8fd6 --- /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 |