More Makefile cleanup (unix)