1 files changed, 17 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 2880ade..30c97a4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,9 @@
 all: dist/lib/stroke.jar
 
+DEFINES = -Dxpp-dir=third-party/xpp -Djzlib-dir=third-party/jzlib -Dicu4j-dir=third-party/ -Dstax2-dir=third-party/stax2/ -Daalto-dir=third-party/aalto/
+
+JUNIT ?= /usr/share/junit/junit.jar
+
 .PHONY : clean
 clean:
 	ant clean
@@ -10,12 +14,20 @@ distclean: clean
 	rm -rf third-party
 
 .PHONY : dist/lib/stroke.jar
-dist/lib/stroke.jar: third-party/xpp/xpp.jar third-party/jzlib/jzlib.jar third-party/icu4j.jar
-	ant -Dxpp-dir=third-party/xpp -Djzlib-dir=third-party/jzlib -Dicu4j-dir=third-party/
+dist/lib/stroke.jar: third-party/jzlib/jzlib.jar third-party/icu4j.jar third-party/aalto/aalto-xml.jar third-party/stax2/stax2-api.jar
+	ant ${DEFINES}
+
+.PHONY : test
+test: dist/lib/stroke.jar
+	ant ${DEFINES} -DJUNIT_JAR=${JUNIT} test
+
+third-party/aalto/aalto-xml.jar:
+	mkdir -p third-party/aalto
+	curl http://repo2.maven.org/maven2/com/fasterxml/aalto-xml/0.9.8/aalto-xml-0.9.8.jar -o third-party/aalto/aalto-xml.jar
 
-third-party/xpp/xpp.jar:
-	mkdir -p third-party/xpp
-	curl http://www.extreme.indiana.edu/dist/java-repository/xpp3/jars/xpp3-1.1.4c.jar -o third-party/xpp/xpp.jar
+third-party/stax2/stax2-api.jar:
+	mkdir -p third-party/stax2
+	curl http://repository.codehaus.org/org/codehaus/woodstox/stax2-api/3.0.3/stax2-api-3.0.3.jar -o third-party/stax2/stax2-api.jar
 
 third-party/jzlib/jzlib.jar:
 	mkdir -p third-party