ad3a0c5
Fix up the Makefile Some more changes are needed, but at least get the simplified version working.