Renamed nmake.mak to Makefile.win everywhere.

Makefile.am

@@ -21,7 +21,7 @@ SUBDIRS =							\
 	$(NULL)
 
 EXTRA_DIST =						\
-	nmake.mak						\
+	Makefile.win					\
 	examples/synergy.conf			\
 	win32util/autodep.cpp			\
 	$(NULL)

Makefile.win

@@ -11,7 +11,7 @@
 # GNU General Public License for more details.
 
 # Name of this file for recursive make
-MAKEFILE = nmake.mak
+MAKEFILE = Makefile.win
 
 # Default build is release is NODEBUG is defined, debug otherwise.
 !if !DEFINED(DEBUG)

cmd/launcher/Makefile.am

@@ -36,7 +36,7 @@ MSWINDOWS_SOURCE_FILES =	\
 	$(NULL)
 
 EXTRA_DIST =					\
-	nmake.mak					\
+	Makefile.win				\
 	synergy.ico					\
 	$(MSWINDOWS_SOURCE_FILES)	\
 	$(NULL)

cmd/synergyc/Makefile.am

@@ -34,7 +34,7 @@ CARBON_SOURCE_FILES =					\
 	$(NULL)
 
 EXTRA_DIST =							\
-	nmake.mak						\
+	Makefile.win						\
 	synergyc.ico						\
 	tb_error.ico						\
 	tb_idle.ico							\

cmd/synergys/Makefile.am

@@ -34,7 +34,7 @@ CARBON_SOURCE_FILES =					\
 	$(NULL)
 
 EXTRA_DIST =							\
-	nmake.mak							\
+	Makefile.win						\
 	synergys.ico						\
 	tb_error.ico						\
 	tb_idle.ico							\

dist/nullsoft/Makefile.am

@@ -14,7 +14,7 @@
 NULL =
 
 EXTRA_DIST =				\
-	nmake.mak				\
+	Makefile.win			\
 	synergy.nsi				\
 	dosify.c				\
 	$(NULL)

doc/compiling.html

@@ -59,7 +59,7 @@ so synergy can find the X11 includes and libraries.
   search to find it.)  It's necessary to run the file if you didn't have
   the installer set up environment variables for you.  Then enter:
   <pre>
-  nmake /nologo /f nmake.mak
+  nmake /nologo /f Makefile.win
   </pre>
   This will build the programs into <span class="code">build\Release</span>.
 </p>
@@ -82,7 +82,7 @@ so synergy can find the X11 includes and libraries.
   the Nullsoft Scriptable Install System.  As in the building on Windows
   description above, enter:
   <pre>
-  nmake /nologo /f nmake.mak installer
+  nmake /nologo /f Makefile.win installer
   </pre>
   to build <span class="code">build\Release\SynergyInstaller.exe</span>.  Run
   this to install synergy.

lib/arch/Makefile.am

@@ -90,7 +90,7 @@ WIN32_SOURCE_FILES = 			\
 
 EXTRA_DIST =					\
 	CMultibyte.cpp				\
-	nmake.mak					\
+	Makefile.win				\
 	vsnprintf.cpp				\
 	$(UNIX_SOURCE_FILES)		\
 	$(WIN32_SOURCE_FILES)		\

lib/base/Makefile.am

@@ -14,7 +14,7 @@
 NULL =
 
 EXTRA_DIST =					\
-	nmake.mak					\
+	Makefile.win				\
 	$(NULL)
 
 MAINTAINERCLEANFILES =			\

lib/client/Makefile.am

@@ -14,7 +14,7 @@
 NULL =
 
 EXTRA_DIST =						\
-	nmake.mak						\
+	Makefile.win					\
 	$(NULL)
 
 MAINTAINERCLEANFILES =				\

lib/common/Makefile.am

@@ -14,7 +14,7 @@
 NULL =
 
 EXTRA_DIST =				\
-	nmake.mak				\
+	Makefile.win			\
 	BasicTypes.h			\
 	IInterface.h			\
 	MacOSXPrecomp.h			\

lib/io/Makefile.am

@@ -14,7 +14,7 @@
 NULL =
 
 EXTRA_DIST =					\
-	nmake.mak					\
+	Makefile.win				\
 	$(NULL)
 
 MAINTAINERCLEANFILES =			\

lib/mt/Makefile.am

@@ -14,7 +14,7 @@
 NULL =
 
 EXTRA_DIST =				\
-	nmake.mak				\
+	Makefile.win			\
 	$(NULL)
 
 MAINTAINERCLEANFILES =		\

lib/net/Makefile.am

@@ -14,7 +14,7 @@
 NULL =
 
 EXTRA_DIST =						\
-	nmake.mak						\
+	Makefile.win					\
 	$(NULL)
 
 MAINTAINERCLEANFILES =				\

lib/platform/Makefile.am

@@ -92,7 +92,7 @@ CARBON_SOURCE_FILES =						\
 	$(NULL)
 
 EXTRA_DIST =								\
-	nmake.mak							\
+	Makefile.win							\
 	$(XWINDOWS_SOURCE_FILES)				\
 	$(MSWINDOWS_SOURCE_FILES)				\
 	$(MSWINDOWS_HOOK_SOURCE_FILES)			\

lib/server/Makefile.am

@@ -14,7 +14,7 @@
 NULL =
 
 EXTRA_DIST =						\
-	nmake.mak						\
+	Makefile.win					\
 	$(NULL)
 
 MAINTAINERCLEANFILES =				\

lib/synergy/Makefile.am

@@ -14,7 +14,7 @@
 NULL =
 
 EXTRA_DIST =					\
-	nmake.mak					\
+	Makefile.win				\
 	$(NULL)
 
 MAINTAINERCLEANFILES =			\