diff --git a/Makefile.am b/Makefile.am
index 0a9e431..bbe6f80 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,10 +37,18 @@
 print-version:
 	@echo $(VERSION)
 
+.PHONY: precross cross cross2
+precross-%: all
+	$(MAKE) -C $* precross
+precross: all precross-test precross-lib
 
-cross: check
+cross: precross
 	sh test/test.sh
 
+# TODO: generate --server and --client switches from "--with(out)-..." build flags
+cross2: precross
+	python test/test.py -s
+
 codespell_skip_files = \
 	*.jar \
 	*.class \