switched everything to one config file; forgot Makefile