Clean up Makefile with some target-specific variables