Rearranged Makefile for upcoming Windows support.