diff options
author | Brandon Low <lostlogic@rockbox.org> | 2006-02-09 04:27:57 +0000 |
---|---|---|
committer | Brandon Low <lostlogic@rockbox.org> | 2006-02-09 04:27:57 +0000 |
commit | 4872825ed2c71e8bb2520681035355b24759d442 (patch) | |
tree | 6010975d41d02a86eed1e3293755f188d3e7a779 /apps/Makefile | |
parent | 8fee5282bad592d33e623bf7dba3de7fee992363 (diff) | |
download | rockbox-4872825ed2c71e8bb2520681035355b24759d442.tar.gz rockbox-4872825ed2c71e8bb2520681035355b24759d442.zip |
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/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/apps/Makefile b/apps/Makefile index 294bc69976..6b3f999112 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -70,7 +70,7 @@ LIBROCKBOX = $(BUILDDIR)/librockbox.a | |||
70 | ifdef SIMVER | 70 | ifdef SIMVER |
71 | # this is a sim build | 71 | # this is a sim build |
72 | 72 | ||
73 | all: build-bitmaps $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) | 73 | all: $(BUILDDIR)/$(BINARY) $(CODECS) $(ROCKS) |
74 | 74 | ||
75 | else | 75 | else |
76 | # regular target build | 76 | # regular target build |
@@ -82,7 +82,7 @@ else | |||
82 | REALBIN = $(BUILDDIR)/$(BINARY) | 82 | REALBIN = $(BUILDDIR)/$(BINARY) |
83 | endif | 83 | endif |
84 | 84 | ||
85 | all: build-bitmaps $(REALBIN) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM) | 85 | all: $(REALBIN) $(FLASHFILE) $(CODECS) $(ROCKS) $(ARCHOSROM) |
86 | endif | 86 | endif |
87 | 87 | ||
88 | dep: $(DEPFILE) | 88 | dep: $(DEPFILE) |
@@ -94,7 +94,9 @@ build-codecs: | |||
94 | build-bitmaps: | 94 | build-bitmaps: |
95 | @$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps | 95 | @$(MAKE) -C bitmaps OBJDIR=$(OBJDIR)/bitmaps |
96 | 96 | ||
97 | rocks: | 97 | $(BITMAPLIBS): build-bitmaps |
98 | |||
99 | rocks: build-codecs | ||
98 | @$(MAKE) -C plugins/lib OBJDIR=$(OBJDIR)/plugins/lib | 100 | @$(MAKE) -C plugins/lib OBJDIR=$(OBJDIR)/plugins/lib |
99 | @$(MAKE) -C plugins OBJDIR=$(OBJDIR)/plugins | 101 | @$(MAKE) -C plugins OBJDIR=$(OBJDIR)/plugins |
100 | 102 | ||