Improved samples makefiles