bit of Makefile reorganization