Convert Makefile targets to support self-hosting