Makefile cleanup to make distro' lives easier