Consolidating makefiles
Further consolidating makefiles
Removing generated makefiles from repository.