[build] get rid of the last few Makefile rule collisions