Makefile changes - one makefile to rule them all