have portable gcc -MM based Makefile working again; cleaned up a bit