use new macros in build make files to simplify it a little