Make Makefile more common, tweak compilation conditionals.