X-Git-Url: http://git.megacz.com/?p=nestedvm.git;a=blobdiff_plain;f=upstream%2FMakefile;h=37d42b5587e6765a0d96ea79665ca835a23c772a;hp=648fd17fa71882f1aa7f7f594f25d1c7fa2e62d4;hb=3175eeed074a015d5621de59c0fa877d4efe5112;hpb=5947c2e6b60f24c0d48892f709483cfe83747da4

diff --git a/upstream/Makefile b/upstream/Makefile
index 648fd17..37d42b5 100644
--- a/upstream/Makefile
+++ b/upstream/Makefile
@@ -29,11 +29,11 @@ configure_newlib = --enable-multilib --target=mips-unknown-elf
 url_openbsdglob = http://www.brianweb.net/xwt/openbsdglob.tar.gz
 url_regex = ftp://ftp.zoo.toronto.edu/pub/regex.shar
 
-version_bcel = 5.1
-url_bcel = http://mirrors.mix5.com/apache/jakarta/bcel/binaries/bcel-$(version_bcel).tar.gz
-
 url_linpack = http://www.math.iastate.edu/burkardt/f_src/linpack_bench/linpack_bench.f
 
+darcs_gcclass = http://darcs.brianweb.net/gcclass
+darcs_classgen = http://darcs.brianweb.net/classgen
+
 .SECONDARY: # This is broken in gmake < 3.79.1
 
 upstream = $(shell pwd)
@@ -53,12 +53,40 @@ tasks/build_newlib: tasks/build_gcc
 cross_root := $(usr)/mips-unknown-elf
 libc_a := $(cross_root)/lib/libc.a
 
+tasks/download_%:
+	if [ -z "$(url_$*)" ]; then echo "No url for $*" >&2; false; fi
+	mkdir -p download
+	cd download && wget --passive-ftp -N $(url_$*)
+	touch $@
+
+tasks/extract_%: tasks/download_%
+	mkdir -p build
+	cd build && \
+		gzip -dc  ../download/$*-$(version_$*).tar.gz | $(TAR) -xf - && \
+		rm -f $* && \
+		ln -s $*-$(version_$*) $*
+	touch $@
+
+tasks/extract_darcs_%:
+	mkdir -p build
+	if [ -z "$(darcs_$*)" ]; then echo "No darcs url for $*" >&2; false; fi
+	cd build && darcs get --verbose "$(darcs_$*)"
+	touch $@
+
+update_darcs_%: tasks/extract_darcs_%
+	cd "build/$*" && darcs pull
+	rm "tasks/build_darcs_$*" # to force a rebuild
+
+tasks/build_darcs_%: tasks/extract_darcs_%
+	cd "build/$*" && make
+	touch $@
+
 tasks/build_extraheaders: $(upstream)/misc/extraheaders.sh tasks/build_newlib
 	# Add extra nestedvm specific headers to include
 	cd $(cross_root)/include && sh $<
 	touch $@
 
-tasks/build_libc: tasks/build_newlib tasks/build_extraheaders tasks/build_regex tasks/build_openbsdglob
+tasks/build_libc: tasks/build_newlib tasks/build_extraheaders tasks/build_regex tasks/build_openbsdglob misc/extraheaders.sh $(patsubst %,$(root)/build/org/ibex/nestedvm/%.o, crt0 support support_aux)
 	# HACK: Get the top level makefile to build the support stuff
 	$(MAKE) -s -C $(root) $(patsubst %,build/org/ibex/nestedvm/%.o, crt0 support support_aux)
 
@@ -82,12 +110,6 @@ clean_%:
 	rm -f "tasks/build_$*" "tasks/patch_$*" "tasks/extract_$*"
 
 
-tasks/download_%:
-	if [ -z "$(url_$*)" ]; then echo "No url for $*" >&2; false; fi
-	mkdir -p download
-	cd download && wget --passive-ftp -N $(url_$*)
-	touch $@
-
 tasks/download_gcc: tasks/download_gcc-core tasks/download_gcc-c++ tasks/download_gcc-g77
 	touch $@
 
@@ -277,11 +299,6 @@ tasks/build_busybox: tasks/patch_busybox tasks/build_libc
 	cd build/busybox && $(MAKE) LDFLAGS="$(MIPS_LDFLAGS)" CFLAGS_EXTRA="$(MIPS_CFLAGS) -DNESTEDVM -g"
 	touch $@
 
-tasks/build_gcclass:
-	cd build &&  darcs get --verbose http://darcs.brianweb.net/gcclass
-	cd build/gcclass && make
-	touch $@
-
 # TeX Stuff
 
 tasks/extract_tex_tangle: