more makefile cleanups