RFR: JDK-8151770: 9-client windows builds failed from 2016-03-11

[Erik Joelsson]

Hello,

The build is currently broken on Windows in jdk9/client. This patch 
reverts some and cleans up the makefile changes made in JDK-8145174. I 
have verified that it builds on Windows and Linux and am just starting a 
JPRT job to verify the rest.

Looking through the review thread for JDK-8145174, it seems like in the 
last version, the makefile was changed to support a windows version of 
the patch without any sources being added for Windows. The bug clearly 
states that it only applies to Linux. I removed those Windows specific 
changes and cleaned up the the rest with correct indentation, removing 
trailing whitespace and moving definition the proper place.

My work day ends now. Since this fix is quite urgent, feel free to push 
it for me to jdk9/client when it's properly reviewed, or use it as base 
for further fixes.

Bug: https://bugs.openjdk.java.net/browse/JDK-8151770
Webrev: http://cr.openjdk.java.net/~erikj/8151770/webrev.01/

/Erik