summaryrefslogtreecommitdiff
path: root/apps/Makefile
diff options
context:
space:
mode:
authorBrandon Low <lostlogic@rockbox.org>2006-02-09 04:27:57 +0000
committerBrandon Low <lostlogic@rockbox.org>2006-02-09 04:27:57 +0000
commit4872825ed2c71e8bb2520681035355b24759d442 (patch)
tree6010975d41d02a86eed1e3293755f188d3e7a779 /apps/Makefile
parent8fee5282bad592d33e623bf7dba3de7fee992363 (diff)
downloadrockbox-4872825ed2c71e8bb2520681035355b24759d442.zip
rockbox-4872825ed2c71e8bb2520681035355b24759d442.tar.gz
rockbox-4872825ed2c71e8bb2520681035355b24759d442.tar.bz2
rockbox-4872825ed2c71e8bb2520681035355b24759d442.tar.xz
Various build sytem cleanups
* Parallel build appears to work properly * Use $(SILENT) instead of @ about everywhere * Less calls to bash by using make builtin substitutions git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8638 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/Makefile')
-rw-r--r--apps/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/Makefile b/apps/Makefile
index 294bc69..6b3f999 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -70,7 +70,7 @@ LIBROCKBOX = $(BUILDDIR)/librockbox.a
ifdef SIMVER
# this is a sim build
-all: build-bitmaps $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS)
+all: $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS)
else
# regular target build
@@ -82,7 +82,7 @@ else
REALBIN = $(BUILDDIR)/$(BINARY)
endif
-all: build-bitmaps $(REALBIN) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM)
+all: $(REALBIN) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM)
endif
dep: $(DEPFILE)
@@ -94,7 +94,9 @@ build-codecs:
build-bitmaps:
@$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps
-rocks:
+$(BITMAPLIBS): build-bitmaps
+
+rocks: build-codecs
@$(MAKE) -C plugins/lib OBJDIR=$(OBJDIR)/plugins/lib
@$(MAKE) -C plugins OBJDIR=$(OBJDIR)/plugins