From 23eea35607d47628b9ce9f880e95f07414d7c311 Mon Sep 17 00:00:00 2001
From: Artem Boldarev <artem.boldarev@gmail.com>
Date: Mon, 11 Jun 2018 21:57:50 +0300
Subject: [PATCH] Added real Makefiles to CormanLispStatic and CormanLispImage
 projects to avoid unnecessary rebuilds.

---
 CormanLispImage/CormanLispImage.vcxproj         |  7 ++++---
 CormanLispImage/CormanLispImage.vcxproj.filters |  1 +
 CormanLispImage/Makefile                        | 17 +++++++++++++++++
 CormanLispServer/CormanLispStatic.vcxproj       | 11 ++++++-----
 .../CormanLispStatic.vcxproj.filters            |  1 +
 CormanLispServer/MakefileStatic.mk              | 16 ++++++++++++++++
 6 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 CormanLispImage/Makefile
 create mode 100644 CormanLispServer/MakefileStatic.mk

diff --git a/CormanLispImage/CormanLispImage.vcxproj b/CormanLispImage/CormanLispImage.vcxproj
index 9272381..4433da7 100644
--- a/CormanLispImage/CormanLispImage.vcxproj
+++ b/CormanLispImage/CormanLispImage.vcxproj
@@ -115,6 +115,7 @@
     <None Include="..\Sys\working.lisp" />
     <None Include="..\Sys\write.lisp" />
     <None Include="..\Sys\xp.lisp" />
+    <None Include="Makefile" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\clconsole\clconsole.vcxproj">
@@ -145,12 +146,12 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Standard|Win32'">
-    <NMakeBuildCommandLine>$(SolutionDir)makeimg.bat</NMakeBuildCommandLine>
+    <NMakeBuildCommandLine>nmake</NMakeBuildCommandLine>
     <NMakeOutput>$(SolutionDir)CormanLisp.img</NMakeOutput>
-    <NMakeReBuildCommandLine>$(SolutionDir)makeimg.bat</NMakeReBuildCommandLine>
+    <NMakeReBuildCommandLine>nmake rebuild</NMakeReBuildCommandLine>
     <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <OutDir>$(ProjectDir)$(Configuration)\</OutDir>
-    <NMakeCleanCommandLine>$(SolutionDir)delimg.bat</NMakeCleanCommandLine>
+    <NMakeCleanCommandLine>nmake clean</NMakeCleanCommandLine>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <NMakeCleanCommandLine>$(SolutionDir)delimg.bat</NMakeCleanCommandLine>
diff --git a/CormanLispImage/CormanLispImage.vcxproj.filters b/CormanLispImage/CormanLispImage.vcxproj.filters
index 15215b2..2659b0c 100644
--- a/CormanLispImage/CormanLispImage.vcxproj.filters
+++ b/CormanLispImage/CormanLispImage.vcxproj.filters
@@ -323,6 +323,7 @@
     <None Include="..\Sys\version.lisp">
       <Filter>Sys</Filter>
     </None>
+    <None Include="Makefile" />
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Sys">
diff --git a/CormanLispImage/Makefile b/CormanLispImage/Makefile
new file mode 100644
index 0000000..9b0b816
--- /dev/null
+++ b/CormanLispImage/Makefile
@@ -0,0 +1,17 @@
+#
+#	File:		Makefile
+#	Contents:	Makefile for CormanLisp.img
+#	History:	11.06.2018  Artem Boldarev Created.
+#
+
+default: ..\CormanLisp.img
+
+# we depend on CormanLispServer.dll because it is good idea to rebuild image after changes in the Lisp kernel
+..\CormanLisp.img: ..\CormanLispServer.dll ../Sys/*.lisp
+	..\makeimg.bat
+
+clean:
+	if exist ..\CormanLisp.img del ..\CormanLisp.img
+
+rebuild: clean default
+
diff --git a/CormanLispServer/CormanLispStatic.vcxproj b/CormanLispServer/CormanLispStatic.vcxproj
index a2bac7b..4d1b3ab 100644
--- a/CormanLispServer/CormanLispStatic.vcxproj
+++ b/CormanLispServer/CormanLispStatic.vcxproj
@@ -8,6 +8,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="delstaticlib.bat" />
+    <None Include="MakefileStatic.mk" />
     <None Include="makestaticlib.bat" />
   </ItemGroup>
   <ItemGroup>
@@ -39,17 +40,17 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Standard|Win32'">
-    <NMakeBuildCommandLine>$(SolutionDir)CormanLispServer\makestaticlib.bat</NMakeBuildCommandLine>
-    <NMakeOutput>$(SolutionDir)\CormanLispServer\bin\CormanLispServer.lib</NMakeOutput>
-    <NMakeReBuildCommandLine>$(SolutionDir)CormanLispServer\makestaticlib.bat</NMakeReBuildCommandLine>
+    <NMakeBuildCommandLine>nmake /f MakefileStatic.mk</NMakeBuildCommandLine>
+    <NMakeOutput>$(SolutionDir)CormanLispServer\bin\CormanLispStatic.lib</NMakeOutput>
+    <NMakeReBuildCommandLine>nmake /f MakefileStatic.mk rebuild</NMakeReBuildCommandLine>
     <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <OutDir>$(SolutionDir)CormanLispServer\bin\</OutDir>
     <IntDir>$(SolutionDir)CormanLispServer\bin\</IntDir>
-    <NMakeCleanCommandLine>$(SolutionDir)CormanLispServer\delstaticlib.bat</NMakeCleanCommandLine>
+    <NMakeCleanCommandLine>nmake /f MakefileStatic.mk clean</NMakeCleanCommandLine>
   </PropertyGroup>
   <ItemDefinitionGroup>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/CormanLispServer/CormanLispStatic.vcxproj.filters b/CormanLispServer/CormanLispStatic.vcxproj.filters
index 81b08ac..b415194 100644
--- a/CormanLispServer/CormanLispStatic.vcxproj.filters
+++ b/CormanLispServer/CormanLispStatic.vcxproj.filters
@@ -3,5 +3,6 @@
   <ItemGroup>
     <None Include="makestaticlib.bat" />
     <None Include="delstaticlib.bat" />
+    <None Include="MakefileStatic.mk" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/CormanLispServer/MakefileStatic.mk b/CormanLispServer/MakefileStatic.mk
new file mode 100644
index 0000000..e155120
--- /dev/null
+++ b/CormanLispServer/MakefileStatic.mk
@@ -0,0 +1,16 @@
+#
+#	File:		Makefile
+#	Contents:	Makefile for CormanLispStatic.lib
+#	History:	11.06.2018  Artem Boldarev Created.
+#
+
+default: ./bin/CormanLispStatic.lib
+
+./bin/CormanLispStatic.lib: ../CormanLispServer.dll
+	makestaticlib.bat
+
+clean:
+	delstaticlib.bat
+
+rebuild: clean default
+