Ok, I think I fixed my makefile simplification. Please check the "makefix" branch and hopefully I did a good job this time. I tested it and it appears not to have the old "remove a .o and fail to rebuild it" glitch you pointed out.