merge Makefile code from verbose_logging branch