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

diff --git a/contrib/benitlux/Makefile b/contrib/benitlux/Makefile
index c14d648..2142041 100644
--- a/contrib/benitlux/Makefile
+++ b/contrib/benitlux/Makefile
@@ -1,19 +1,19 @@
 SERVER ?= localhost:8080
 
-all: server
+all: server bin/report bin/benitlux
 
 server: bin/benitlux_daily bin/benitlux_web
-bin/benitlux_daily: $(shell ../../bin/nitls -M src/benitlux_daily.nit)
+bin/benitlux_daily: $(shell ../../bin/nitls -M src/server/benitlux_daily.nit)
 	mkdir -p bin/
-	../../bin/nitc -o $@ src/benitlux_daily.nit
+	../../bin/nitc -o $@ src/server/benitlux_daily.nit
 
-bin/benitlux_web: $(shell ../../bin/nitls -M src/benitlux_web.nit) src/benitlux_restful.nit
+bin/benitlux_web: $(shell ../../bin/nitls -M src/server/server.nit) src/server/benitlux_restful.nit
 	mkdir -p bin/
-	../../bin/nitc -o $@ src/benitlux_web.nit -D iface=$(SERVER)
+	../../bin/nitc -o $@ src/server/server.nit -D iface=$(SERVER)
 
-pre-build: src/benitlux_restful.nit
-src/benitlux_restful.nit: $(shell ../../bin/nitls -M src/benitlux_controller.nit)
-	../../bin/nitrestful -o $@ src/benitlux_controller.nit
+pre-build: src/server/benitlux_restful.nit
+src/server/benitlux_restful.nit: $(shell ../../bin/nitls -M src/server/benitlux_controller.nit)
+	../../bin/nitrestful -o $@ src/server/benitlux_controller.nit
 
 # ---
 # Report
@@ -23,3 +23,64 @@ bin/report: $(shell ../../bin/nitls -M src/report.nit)
 
 report: bin/report
 	bin/report
+
+# ---
+# GTK+ client
+
+bin/benitlux: $(shell ../../bin/nitls -M src/client/client.nit)
+	mkdir -p bin/
+	../../bin/nitc -o bin/benitlux src/client/client.nit -m linux -D benitlux_rest_server_uri=http://$(SERVER)/
+
+# ---
+# Android
+
+# Main icon
+android/res/drawable-hdpi/icon.png:
+	../inkscape_tools/bin/svg_to_icons art/icon.svg --android --out android/res/
+
+# Notification icon, white only
+android/res/drawable-hdpi/notif.png:
+	../inkscape_tools/bin/svg_to_icons art/notif.svg --android --out android/res/ --name notif
+
+android-res: android/res/drawable-hdpi/icon.png android/res/drawable-hdpi/notif.png
+
+# Dev / debug app
+android: bin/benitlux.apk
+bin/benitlux.apk: $(shell ../../bin/nitls -M src/client/android.nit) android-res
+	mkdir -p bin/ res/
+	../../bin/nitc -o $@ src/client/android.nit -m src/client/features/debug.nit \
+		-D benitlux_rest_server_uri=http://$(SERVER)/
+
+# Pure portable prototype, for comparison
+bin/proto.apk: $(shell ../../bin/nitls -M src/client/android_proto.nit) android-res
+	mkdir -p bin/ res/
+	../../bin/nitc -o $@ src/client/android_proto.nit \
+		-D benitlux_rest_server_uri=http://$(SERVER)/
+
+# Release version
+android-release: $(shell ../../bin/nitls -M src/client/android.nit) android-res
+	mkdir -p bin/ res/
+	../../bin/nitc -o bin/benitlux.apk src/client/android.nit \
+		-D benitlux_rest_server_uri=http://xymus.net/benitlux/ --release
+
+# ---
+# iOS
+
+ios: bin/benitlux.app
+bin/benitlux.app: $(shell ../../bin/nitls -M src/client/ios.nit) ios/AppIcon.appiconset/Contents.json
+	mkdir -p bin/
+	rm -rf bin/benitlux.app/
+	../../bin/nitc -o bin/benitlux.app src/client/ios.nit -D benitlux_rest_server_uri=http://$(SERVER)/
+
+bin/proto.app: $(shell ../../bin/nitls -M src/client/ios_proto.nit) ios/AppIcon.appiconset/Contents.json
+	mkdir -p bin/ res/
+	../../bin/nitc -o $@ src/client/ios_proto.nit \
+		-D benitlux_rest_server_uri=http://$(SERVER)/
+
+ios-release: $(shell ../../bin/nitls -M src/client/ios.nit) ios/AppIcon.appiconset/Contents.json
+	mkdir -p bin/
+	../../bin/nitc -o bin/benitlux.app src/client/ios.nit -D benitlux_rest_server_uri=http://$(SERVER)/
+
+ios/AppIcon.appiconset/Contents.json: art/icon.svg
+	mkdir -p ios
+	../inkscape_tools/bin/svg_to_icons art/icon.svg --ios --out ios/AppIcon.appiconset/