Makefile modernization

Still in progress...