Adjust Makefile slightly
Sync make.bat with Makefile

This also deals with a few missing operations in the Windows version
of the build system.