From 8f9896038dfb22627a639d549ef590862c73c2b0 Mon Sep 17 00:00:00 2001 From: crs23 Date: Thu, 6 Sep 2007 05:07:29 +0000 Subject: [PATCH] Renamed nmake.mak to Makefile.win everywhere. --- Makefile.am | 2 +- nmake.mak => Makefile.win | 2 +- cmd/launcher/Makefile.am | 2 +- cmd/launcher/{nmake.mak => Makefile.win} | 0 cmd/synergyc/Makefile.am | 2 +- cmd/synergyc/{nmake.mak => Makefile.win} | 0 cmd/synergys/Makefile.am | 2 +- cmd/synergys/{nmake.mak => Makefile.win} | 0 dist/nullsoft/Makefile.am | 2 +- dist/nullsoft/{nmake.mak => Makefile.win} | 0 doc/compiling.html | 4 ++-- lib/arch/Makefile.am | 2 +- lib/arch/{nmake.mak => Makefile.win} | 0 lib/base/Makefile.am | 2 +- lib/base/{nmake.mak => Makefile.win} | 0 lib/client/Makefile.am | 2 +- lib/client/{nmake.mak => Makefile.win} | 0 lib/common/Makefile.am | 2 +- lib/common/{nmake.mak => Makefile.win} | 0 lib/io/Makefile.am | 2 +- lib/io/{nmake.mak => Makefile.win} | 0 lib/mt/Makefile.am | 2 +- lib/mt/{nmake.mak => Makefile.win} | 0 lib/net/Makefile.am | 2 +- lib/net/{nmake.mak => Makefile.win} | 0 lib/platform/Makefile.am | 2 +- lib/platform/{nmake.mak => Makefile.win} | 0 lib/server/Makefile.am | 2 +- lib/server/{nmake.mak => Makefile.win} | 0 lib/synergy/Makefile.am | 2 +- lib/synergy/{nmake.mak => Makefile.win} | 0 31 files changed, 18 insertions(+), 18 deletions(-) rename nmake.mak => Makefile.win (99%) rename cmd/launcher/{nmake.mak => Makefile.win} (100%) rename cmd/synergyc/{nmake.mak => Makefile.win} (100%) rename cmd/synergys/{nmake.mak => Makefile.win} (100%) rename dist/nullsoft/{nmake.mak => Makefile.win} (100%) rename lib/arch/{nmake.mak => Makefile.win} (100%) rename lib/base/{nmake.mak => Makefile.win} (100%) rename lib/client/{nmake.mak => Makefile.win} (100%) rename lib/common/{nmake.mak => Makefile.win} (100%) rename lib/io/{nmake.mak => Makefile.win} (100%) rename lib/mt/{nmake.mak => Makefile.win} (100%) rename lib/net/{nmake.mak => Makefile.win} (100%) rename lib/platform/{nmake.mak => Makefile.win} (100%) rename lib/server/{nmake.mak => Makefile.win} (100%) rename lib/synergy/{nmake.mak => Makefile.win} (100%) diff --git a/Makefile.am b/Makefile.am index 566aacf7..26a5086f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,7 +21,7 @@ SUBDIRS = \ $(NULL) EXTRA_DIST = \ - nmake.mak \ + Makefile.win \ examples/synergy.conf \ win32util/autodep.cpp \ $(NULL) diff --git a/nmake.mak b/Makefile.win similarity index 99% rename from nmake.mak rename to Makefile.win index 27a6e1cb..d232b58a 100644 --- a/nmake.mak +++ b/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) diff --git a/cmd/launcher/Makefile.am b/cmd/launcher/Makefile.am index 27c3cce6..6fc879e3 100644 --- a/cmd/launcher/Makefile.am +++ b/cmd/launcher/Makefile.am @@ -36,7 +36,7 @@ MSWINDOWS_SOURCE_FILES = \ $(NULL) EXTRA_DIST = \ - nmake.mak \ + Makefile.win \ synergy.ico \ $(MSWINDOWS_SOURCE_FILES) \ $(NULL) diff --git a/cmd/launcher/nmake.mak b/cmd/launcher/Makefile.win similarity index 100% rename from cmd/launcher/nmake.mak rename to cmd/launcher/Makefile.win diff --git a/cmd/synergyc/Makefile.am b/cmd/synergyc/Makefile.am index 70360e77..b6e8c83d 100644 --- a/cmd/synergyc/Makefile.am +++ b/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 \ diff --git a/cmd/synergyc/nmake.mak b/cmd/synergyc/Makefile.win similarity index 100% rename from cmd/synergyc/nmake.mak rename to cmd/synergyc/Makefile.win diff --git a/cmd/synergys/Makefile.am b/cmd/synergys/Makefile.am index c1a0dee1..4ad48ce5 100644 --- a/cmd/synergys/Makefile.am +++ b/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 \ diff --git a/cmd/synergys/nmake.mak b/cmd/synergys/Makefile.win similarity index 100% rename from cmd/synergys/nmake.mak rename to cmd/synergys/Makefile.win diff --git a/dist/nullsoft/Makefile.am b/dist/nullsoft/Makefile.am index 968f23cf..120cd016 100644 --- a/dist/nullsoft/Makefile.am +++ b/dist/nullsoft/Makefile.am @@ -14,7 +14,7 @@ NULL = EXTRA_DIST = \ - nmake.mak \ + Makefile.win \ synergy.nsi \ dosify.c \ $(NULL) diff --git a/dist/nullsoft/nmake.mak b/dist/nullsoft/Makefile.win similarity index 100% rename from dist/nullsoft/nmake.mak rename to dist/nullsoft/Makefile.win diff --git a/doc/compiling.html b/doc/compiling.html index 47772be6..69321913 100644 --- a/doc/compiling.html +++ b/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: 
-  nmake /nologo /f nmake.mak
+  nmake /nologo /f Makefile.win
This will build the programs into build\Release.

@@ -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: 
-  nmake /nologo /f nmake.mak installer
+  nmake /nologo /f Makefile.win installer
to build build\Release\SynergyInstaller.exe. Run this to install synergy. diff --git a/lib/arch/Makefile.am b/lib/arch/Makefile.am index 049c3146..8a1749ab 100644 --- a/lib/arch/Makefile.am +++ b/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) \ diff --git a/lib/arch/nmake.mak b/lib/arch/Makefile.win similarity index 100% rename from lib/arch/nmake.mak rename to lib/arch/Makefile.win diff --git a/lib/base/Makefile.am b/lib/base/Makefile.am index 4fec44d8..a53c8b33 100644 --- a/lib/base/Makefile.am +++ b/lib/base/Makefile.am @@ -14,7 +14,7 @@ NULL = EXTRA_DIST = \ - nmake.mak \ + Makefile.win \ $(NULL) MAINTAINERCLEANFILES = \ diff --git a/lib/base/nmake.mak b/lib/base/Makefile.win similarity index 100% rename from lib/base/nmake.mak rename to lib/base/Makefile.win diff --git a/lib/client/Makefile.am b/lib/client/Makefile.am index 40caacc2..4ea5a230 100644 --- a/lib/client/Makefile.am +++ b/lib/client/Makefile.am @@ -14,7 +14,7 @@ NULL = EXTRA_DIST = \ - nmake.mak \ + Makefile.win \ $(NULL) MAINTAINERCLEANFILES = \ diff --git a/lib/client/nmake.mak b/lib/client/Makefile.win similarity index 100% rename from lib/client/nmake.mak rename to lib/client/Makefile.win diff --git a/lib/common/Makefile.am b/lib/common/Makefile.am index b81d4e42..74804748 100644 --- a/lib/common/Makefile.am +++ b/lib/common/Makefile.am @@ -14,7 +14,7 @@ NULL = EXTRA_DIST = \ - nmake.mak \ + Makefile.win \ BasicTypes.h \ IInterface.h \ MacOSXPrecomp.h \ diff --git a/lib/common/nmake.mak b/lib/common/Makefile.win similarity index 100% rename from lib/common/nmake.mak rename to lib/common/Makefile.win diff --git a/lib/io/Makefile.am b/lib/io/Makefile.am index 9c849b73..fec1dd31 100644 --- a/lib/io/Makefile.am +++ b/lib/io/Makefile.am @@ -14,7 +14,7 @@ NULL = EXTRA_DIST = \ - nmake.mak \ + Makefile.win \ $(NULL) MAINTAINERCLEANFILES = \ diff --git a/lib/io/nmake.mak b/lib/io/Makefile.win similarity index 100% rename from lib/io/nmake.mak rename to lib/io/Makefile.win diff --git a/lib/mt/Makefile.am b/lib/mt/Makefile.am index beae3df9..fbf01c03 100644 --- a/lib/mt/Makefile.am +++ b/lib/mt/Makefile.am @@ -14,7 +14,7 @@ NULL = EXTRA_DIST = \ - nmake.mak \ + Makefile.win \ $(NULL) MAINTAINERCLEANFILES = \ diff --git a/lib/mt/nmake.mak b/lib/mt/Makefile.win similarity index 100% rename from lib/mt/nmake.mak rename to lib/mt/Makefile.win diff --git a/lib/net/Makefile.am b/lib/net/Makefile.am index c3ff4c34..b49fe363 100644 --- a/lib/net/Makefile.am +++ b/lib/net/Makefile.am @@ -14,7 +14,7 @@ NULL = EXTRA_DIST = \ - nmake.mak \ + Makefile.win \ $(NULL) MAINTAINERCLEANFILES = \ diff --git a/lib/net/nmake.mak b/lib/net/Makefile.win similarity index 100% rename from lib/net/nmake.mak rename to lib/net/Makefile.win diff --git a/lib/platform/Makefile.am b/lib/platform/Makefile.am index 3edf1be9..6ff0523c 100644 --- a/lib/platform/Makefile.am +++ b/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) \ diff --git a/lib/platform/nmake.mak b/lib/platform/Makefile.win similarity index 100% rename from lib/platform/nmake.mak rename to lib/platform/Makefile.win diff --git a/lib/server/Makefile.am b/lib/server/Makefile.am index d435aca8..e03d9b7c 100644 --- a/lib/server/Makefile.am +++ b/lib/server/Makefile.am @@ -14,7 +14,7 @@ NULL = EXTRA_DIST = \ - nmake.mak \ + Makefile.win \ $(NULL) MAINTAINERCLEANFILES = \ diff --git a/lib/server/nmake.mak b/lib/server/Makefile.win similarity index 100% rename from lib/server/nmake.mak rename to lib/server/Makefile.win diff --git a/lib/synergy/Makefile.am b/lib/synergy/Makefile.am index 03979e64..480102a4 100644 --- a/lib/synergy/Makefile.am +++ b/lib/synergy/Makefile.am @@ -14,7 +14,7 @@ NULL = EXTRA_DIST = \ - nmake.mak \ + Makefile.win \ $(NULL) MAINTAINERCLEANFILES = \ diff --git a/lib/synergy/nmake.mak b/lib/synergy/Makefile.win similarity index 100% rename from lib/synergy/nmake.mak rename to lib/synergy/Makefile.win