fixed up Makefile to make emacs happy, updated download locations

[nestedvm.git] / Makefile

diff --git a/Makefile b/Makefile
index e539ef6..f37b90d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -90,7 +90,7 @@ $(tasks)/%:
                MIPS_CFLAGS="$(filter-out -Werror,$(MIPS_CFLAGS))" \
                MIPS_PCFLAGS="$(filter-out -Werror,$(MIPS_PCFLAGS))" \
                MIPS_LDFLAGS="$(MIPS_LDFLAGS)"
-               
+
 upstream_clean_%:
        $(MAKE) -C upstream clean_$* usr="$(usr)"
 
@@ -239,7 +239,7 @@ compact_runtime_compiler.jar: $(java_classes) .manifest $(tasks)/build_darcs_gcc
        mkdir -p tmp/pruned
        rm -rf tmp/pruned/*
        $(JAVA) -cp \
-               upstream/build/gcclass/build:upstream/build/gcclass/upstream/bcel-5.1/bcel-5.1.jar \
+               upstream/build/gcclass/build:upstream/build/gcclass/upstream/bcel-5.2/bcel-5.2.jar \
        com.brian_web.gcclass.GCClass \
                "$(classpath)" tmp/pruned org.ibex.nestedvm.RuntimeCompiler.main `cat .gcclass_hints`
        cd tmp/pruned && jar cfm ../../$@ ../../.manifest .
@@ -430,7 +430,7 @@ build/tests/SpeedTest.class: build/org/ibex/nestedvm/Runtime.class
 
 tmp/thebride_1280.jpg:
        @mkdir -p tmp
-       cd tmp && wget http://www.kill-bill.com/images/wallpaper/thebride_1280.jpg
+       cd tmp && curl -O http://www.kill-bill.com/images/wallpaper/thebride_1280.jpg
 
 oldspeedtest: build/tests/DJpeg.class tmp/thebride_1280.jpg
        bash -c "time $(JAVA) -cp build tests.DJpeg -targa -outfile tmp/thebride_1280.tga tmp/thebride_1280.jpg"