diff options
author | Björn Stenberg <bjorn@haxx.se> | 2008-10-29 15:59:20 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2008-10-29 15:59:20 +0000 |
commit | 3e4c9f760bb10865b1cf4d6ba942387d7843ec28 (patch) | |
tree | 3232842d1d12269b6cf58b42ed4bfd3bea624371 | |
parent | 5fa5578284e007d5e95e8907d32b720462d2e51c (diff) | |
download | rockbox-3e4c9f760bb10865b1cf4d6ba942387d7843ec28.tar.gz rockbox-3e4c9f760bb10865b1cf4d6ba942387d7843ec28.zip |
Added an explicit bitmap dependency to icons.h to resolve issues with parallell builds (-j).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18922 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/Makefile b/apps/Makefile index 1e0be5538e..cc5594a7dd 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -106,20 +106,20 @@ build-codecs: | |||
106 | $(SILENT)$(MAKE) -C codecs/lib OBJDIR=$(OBJDIR)/codecs/lib | 106 | $(SILENT)$(MAKE) -C codecs/lib OBJDIR=$(OBJDIR)/codecs/lib |
107 | $(SILENT)$(MAKE) -C codecs OBJDIR=$(OBJDIR)/codecs | 107 | $(SILENT)$(MAKE) -C codecs OBJDIR=$(OBJDIR)/codecs |
108 | 108 | ||
109 | build-bitmapsmono: | 109 | recorder/icons.h: $(BITMAPLIBS) |
110 | |||
111 | $(BUILDDIR)/libbitmapsmono.a: | ||
110 | $(call PRINTS,MAKE in bitmaps/mono)$(MAKE) -C bitmaps/mono OBJDIR=$(OBJDIR)/bitmaps/mono | 112 | $(call PRINTS,MAKE in bitmaps/mono)$(MAKE) -C bitmaps/mono OBJDIR=$(OBJDIR)/bitmaps/mono |
111 | 113 | ||
112 | build-bitmapsnative: | 114 | $(BUILDDIR)/libbitmapsnative.a: |
113 | $(call PRINTS,MAKE in bitmaps/native)$(MAKE) -C bitmaps/native OBJDIR=$(OBJDIR)/bitmaps/native | 115 | $(call PRINTS,MAKE in bitmaps/native)$(MAKE) -C bitmaps/native OBJDIR=$(OBJDIR)/bitmaps/native |
114 | 116 | ||
115 | build-bitmapsremotemono: | 117 | $(BUILDDIR)/libbitmapsremotemono.a: |
116 | $(call PRINTS,MAKE in bitmaps/remote_mono)$(MAKE) -C bitmaps/remote_mono OBJDIR=$(OBJDIR)/bitmaps/remote_mono | 118 | $(call PRINTS,MAKE in bitmaps/remote_mono)$(MAKE) -C bitmaps/remote_mono OBJDIR=$(OBJDIR)/bitmaps/remote_mono |
117 | 119 | ||
118 | build-bitmapsremotenative: | 120 | $(BUILDDIR)/libbitmapsremotenative.a: |
119 | $(call PRINTS,MAKE in bitmaps/remote_native)$(MAKE) -C bitmaps/remote_native OBJDIR=$(OBJDIR)/bitmaps/remote_native | 121 | $(call PRINTS,MAKE in bitmaps/remote_native)$(MAKE) -C bitmaps/remote_native OBJDIR=$(OBJDIR)/bitmaps/remote_native |
120 | 122 | ||
121 | $(BITMAPLIBS): $(BUILDDIR)/lib%.a: build-% | ||
122 | |||
123 | rocks: build-codecs | 123 | rocks: build-codecs |
124 | $(SILENT)$(MAKE) -C plugins/lib OBJDIR=$(OBJDIR)/plugins/lib | 124 | $(SILENT)$(MAKE) -C plugins/lib OBJDIR=$(OBJDIR)/plugins/lib |
125 | $(SILENT)$(MAKE) -C plugins OBJDIR=$(OBJDIR)/plugins | 125 | $(SILENT)$(MAKE) -C plugins OBJDIR=$(OBJDIR)/plugins |