Remote make scrip refactoring.