X-Git-Url: http://nitlanguage.org

diff --git a/examples/calculator/Makefile b/examples/calculator/Makefile
index 43cdcc4..24b10ab 100644
--- a/examples/calculator/Makefile
+++ b/examples/calculator/Makefile
@@ -1,10 +1,35 @@
-all:
-	mkdir -p bin/
+NITC=../../bin/nitc
+NITLS=../../bin/nitls
 
-	# Compile in global mode to silence warnings on unused GTK deprecated
-	../../bin/nitc --global --dir bin/ src/calculator_gtk.nit src/calculator_test.nit
+all: bin/calculator bin/test
 
-android:
-	mkdir -p bin/ res/
+bin/calculator: $(shell ${NITLS} -M src/calculator.nit -m linux) ${NITC}
+	mkdir -p bin
+	${NITC} -o $@ src/calculator.nit -m linux
+
+android: bin/calculator.apk
+
+bin/calculator.apk: $(shell ${NITLS} -M src/calculator.nit -m android) ${NITC} res/drawable-ldpi/icon.png
+	mkdir -p bin
+	${NITC} -o $@ src/calculator.nit -m ../../lib/android/ui/ -D debug
+
+android-release: $(shell ${NITLS} -M src/calculator.nit -m android) ${NITC} res/drawable-ldpi/icon.png
+	mkdir -p bin
+	${NITC} -o bin/calculator.apk src/calculator.nit -m ../../lib/android/ui/ --release
+
+res/drawable-ldpi/icon.png: art/icon.svg ../../contrib/inkscape_tools/bin/svg_to_icons
+	mkdir -p res
 	../../contrib/inkscape_tools/bin/svg_to_icons art/icon.svg --android --out res/
-	../../bin/nitc -o bin/calculator.apk src/calculator_android.nit
+
+../../contrib/inkscape_tools/bin/svg_to_icons:
+	make -C ../../contrib/inkscape_tools/
+
+android-install: bin/calculator.apk
+	adb install -r bin/calculator.apk
+
+bin/test: $(shell ${NITLS} -M src/calculator_test.nit) ${NITC}
+	mkdir -p bin
+	${NITC} -o $@ src/calculator_test.nit
+
+check: bin/test
+	bin/test