Improved makefiles a bit.