Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adjusted the bitmap build to run make in the bitmap directories

Browse source 
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
This commit is contained in:
Daniel Stenberg 2006-01-26 11:57:53 +00:00
parent 4a6b2c5a69
commit 751d199587
5 changed files with 78 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/FILES
View file

@ -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

25
apps/Makefile
View file

@ -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

34
apps/bitmaps/Makefile Normal file
View file

@ -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

5
apps/plugins/Makefile
View file

@ -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 $@`; \

34
apps/plugins/bitmaps/Makefile Normal file
View file

@ -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