Makefile cleanups. (also, use tabs in makefiles)