Consolidated to one make file