More ABC releated Makefile changes