merge Makefile code from verbose_logging branch
removed tracking on *.oxo files