also various other Makefile tidy-ups - extract consts for various targets - mark non-file targets as phony - use $@ when possible