summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-11-28 09:26:34 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-11-28 09:26:34 +0000
commit446dc2aae1636570c433594d2b48b2e8052e5b90 (patch)
tree05196993632959583f627d109d6b9eb5fdd38b80 /apps
parentc1a3d3154cf3570182c4e5e46e355addf739d09f (diff)
downloadrockbox-446dc2aae1636570c433594d2b48b2e8052e5b90.tar.gz
rockbox-446dc2aae1636570c433594d2b48b2e8052e5b90.zip
use the uclpack built in the tools dir
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8096 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
-rw-r--r--apps/Makefile33
1 files changed, 8 insertions, 25 deletions
diff --git a/apps/Makefile b/apps/Makefile
index aa565382c8..4fa225033b 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -129,34 +129,17 @@ $(BUILDDIR)/$(BINARY) : $(OBJS) $(DEPFILE) $(BUILDDIR)/libsim.a \
endif
$(BUILDDIR)/rockbox.ucl: $(OBJDIR)/rockbox.bin
- @a=`uclpack -h 2>/dev/null`; \
- if test -n "$$a"; then \
- echo "UCLPACK rockbox" ; \
- uclpack --best --2e $< $@ >/dev/null 2>&1; \
- else \
- echo "no uclpack command found, makes a fake rockbox.ucl"; \
- echo "fake" > $@; \
- fi
+ $(SILENT)(echo "UCLPACK rockbox" ; \
+ $(TOOLSDIR)/uclpack --best --2e $< $@ >/dev/null 2>&1;)
$(BUILDDIR)/rombox.ucl: $(OBJDIR)/rombox.bin $(MAXOUTFILE)
- @a=`uclpack -h 2>/dev/null`; \
- if test -n "$$a"; then \
- echo "UCLPACK rombox" ; \
- uclpack --none $< $@ >/dev/null 2>&1; \
- if test -s $@; then \
- perl $(TOOLSDIR)/romsizetest.pl `cat $(MAXOUTFILE)` $<; \
- if test $$? -ne 0; then \
- echo "removing UCL file again, making it a fake one"; \
- echo "fake" > $@; \
- fi \
- else \
- echo "Your uclpack seems to not support --none, making a fake ucl"; \
- echo "fake" > $@; \
- fi \
- else \
- echo "no uclpack command found, makes a fake rombox.ucl"; \
+ $(SILENT)(echo "UCLPACK rombox" ; \
+ $(TOOLSDIR)/uclpack --none $< $@ >/dev/null 2>&1; \
+ perl $(TOOLSDIR)/romsizetest.pl `cat $(MAXOUTFILE)` $<; \
+ if test $$? -ne 0; then \
+ echo "removing UCL file again, making it a fake one"; \
echo "fake" > $@; \
- fi
+ fi)
include $(TOOLSDIR)/make.inc