makefiles + corresponding gitignore changes