Switched to better Makefile skeleton