Merge builder Makefile into main Makefile