clean up some makefile issues. (NicJA)