Cleanup Makefile to get rid of random hacks and to simplify for consistency between packages. Signed-off-by: Rosen Penev <rosenp@gmail.com>