DEV: enhance build rules