Revert "Revert "Makefile: allow for different compilation methods""