switch to makefile instead of oasis, simplify