some makefile cleanups