minor makefile cleanups