diff options
author | Björn Stenberg <bjorn@haxx.se> | 2008-11-20 12:44:49 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2008-11-20 12:44:49 +0000 |
commit | 8ce3556236d7dac3fd076b846b64ae88597a0991 (patch) | |
tree | 5d1085b5f8a602234ea1ea512b7afb8f77a9a0dc /apps | |
parent | d96ce0a87de7fd09322cc0e9d6b698282c4200a7 (diff) | |
download | rockbox-8ce3556236d7dac3fd076b846b64ae88597a0991.tar.gz rockbox-8ce3556236d7dac3fd076b846b64ae88597a0991.zip |
Bug fix again. Moved cp outside of $(shell) to force make to run it sequentially.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19149 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r-- | apps/codecs/codecs.make | 3 | ||||
-rw-r--r-- | apps/plugins/plugins.make | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/apps/codecs/codecs.make b/apps/codecs/codecs.make index 4a73f333ac..142b25789c 100644 --- a/apps/codecs/codecs.make +++ b/apps/codecs/codecs.make | |||
@@ -99,8 +99,7 @@ $(CODECDIR)/%.codec: $(CODECDIR)/%.o | |||
99 | $(filter %.a, $^) \ | 99 | $(filter %.a, $^) \ |
100 | -lgcc $(CODECLDFLAGS) | 100 | -lgcc $(CODECLDFLAGS) |
101 | ifdef SIMVER | 101 | ifdef SIMVER |
102 | $(SILENT)$(shell cp $(CODECDIR)/$*.elf $@) | 102 | $(SILENT)cp $(CODECDIR)/$*.elf $@ |
103 | else | 103 | else |
104 | $(SILENT)$(OC) -O binary $(CODECDIR)/$*.elf $@ | 104 | $(SILENT)$(OC) -O binary $(CODECDIR)/$*.elf $@ |
105 | endif | 105 | endif |
106 | |||
diff --git a/apps/plugins/plugins.make b/apps/plugins/plugins.make index bb77f7de6c..1efd513396 100644 --- a/apps/plugins/plugins.make +++ b/apps/plugins/plugins.make | |||
@@ -74,7 +74,7 @@ $(BUILDDIR)/%.rock: $(BUILDDIR)/%.o $(PLUGINLINK_LDS) | |||
74 | $(filter %.a, $^) \ | 74 | $(filter %.a, $^) \ |
75 | -lgcc $(PLUGINLDFLAGS) | 75 | -lgcc $(PLUGINLDFLAGS) |
76 | ifdef SIMVER | 76 | ifdef SIMVER |
77 | $(SILENT)$(shell cp $(BUILDDIR)/$*.elf $@) | 77 | $(SILENT)cp $(BUILDDIR)/$*.elf $@ |
78 | else | 78 | else |
79 | $(SILENT)$(OC) -O binary $(BUILDDIR)/$*.elf $@ | 79 | $(SILENT)$(OC) -O binary $(BUILDDIR)/$*.elf $@ |
80 | endif \ No newline at end of file | 80 | endif \ No newline at end of file |