[librsvg/nmake: 5/9] Visual Studio builds: Transition Rust builds for full NMake

[Chun-wei Fan <fanchunwei src gnome org>]

commit dc7a3d26b64583842879482de400b5742c368c8f
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Wed Jun 26 17:50:06 2019 +0800

    Visual Studio builds: Transition Rust builds for full NMake
    
    As we are going to integrate win32/rsvg-rust.mak into our NMake
    Makefiles, we need to remove its 'all' target and re-name our 'clean'
    target.

 win32/rsvg-rust.mak          |  4 +---
 win32/vs12/rsvg-rust.vcxproj | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 15 deletions(-)
---
diff --git a/win32/rsvg-rust.mak b/win32/rsvg-rust.mak
index 65e80aef..bfd065c4 100644
--- a/win32/rsvg-rust.mak
+++ b/win32/rsvg-rust.mak
@@ -32,8 +32,6 @@ CARGO_CMD = $(CARGO) build $(CARGO_TARGET) --release
 CARGO_CMD = $(CARGO) build $(CARGO_TARGET)
 !endif
 
-all: vs$(VSVER)\$(CFG)\$(PLAT)\obj\rsvg_internals\$(RUST_TARGET)-pc-windows-msvc\$(CFG)\rsvg_internals.lib
-
 vs$(VSVER)\$(CFG)\$(PLAT)\obj\rsvg_internals\$(RUST_TARGET)-pc-windows-msvc\$(CFG)\rsvg_internals.lib:
        @set CARGO_TARGET_DIR=..\win32\vs$(VSVER)\$(CFG)\$(PLAT)\obj\rsvg_internals
        @set GTK_LIB_DIR=..\..\vs$(VSVER)\$(PLAT)\lib;$(LIB)
@@ -44,7 +42,7 @@ vs$(VSVER)\$(CFG)\$(PLAT)\obj\rsvg_internals\$(RUST_TARGET)-pc-windows-msvc\$(CF
        @set GTK_LIB_DIR=
        @set CARGO_TARGET_DIR=
 
-clean:
+cargo-clean:
        @set CARGO_TARGET_DIR=..\win32\vs$(VSVER)\$(CFG)\$(PLAT)\obj\rsvg_internals
        @cd ..\rsvg_internals
        @$(CARGO) clean
diff --git a/win32/vs12/rsvg-rust.vcxproj b/win32/vs12/rsvg-rust.vcxproj
index 4ee2891f..71902a6f 100644
--- a/win32/vs12/rsvg-rust.vcxproj
+++ b/win32/vs12/rsvg-rust.vcxproj
@@ -68,27 +68,27 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <NMakeBuildCommandLine>$(RsvgRustNMakeCmd)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(RsvgRustNMakeCmd) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(RsvgRustNMakeCmd) clean</NMakeCleanCommandLine>
+    <NMakeBuildCommandLine>$(RsvgRustNMakeCmd) 
vs$(VSVer)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>$(RsvgRustNMakeCmd) cargo-clean 
vs$(VSVer)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>$(RsvgRustNMakeCmd) cargo-clean</NMakeCleanCommandLine>
     
<NMakeOutput>$(SolutionDir)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeOutput>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <NMakeBuildCommandLine>$(RsvgRustNMakeCmd)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(RsvgRustNMakeCmd) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(RsvgRustNMakeCmd) clean</NMakeCleanCommandLine>
+    <NMakeBuildCommandLine>$(RsvgRustNMakeCmd) 
vs$(VSVer)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>$(RsvgRustNMakeCmd) cargo-clean 
vs$(VSVer)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>$(RsvgRustNMakeCmd) cargo-clean</NMakeCleanCommandLine>
     
<NMakeOutput>$(SolutionDir)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeOutput>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>$(RsvgRustNMakeCmd)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(RsvgRustNMakeCmd) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(RsvgRustNMakeCmd) clean</NMakeCleanCommandLine>
+    <NMakeBuildCommandLine>$(RsvgRustNMakeCmd) 
vs$(VSVer)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>$(RsvgRustNMakeCmd) cargo-clean 
vs$(VSVer)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>$(RsvgRustNMakeCmd) cargo-clean</NMakeCleanCommandLine>
     
<NMakeOutput>$(SolutionDir)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeOutput>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>$(RsvgRustNMakeCmd)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(RsvgRustNMakeCmd) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(RsvgRustNMakeCmd) clean</NMakeCleanCommandLine>
+    <NMakeBuildCommandLine>$(RsvgRustNMakeCmd) 
vs$(VSVer)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeBuildCommandLine>
+    <NMakeReBuildCommandLine>$(RsvgRustNMakeCmd) cargo-clean 
vs$(VSVer)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeReBuildCommandLine>
+    <NMakeCleanCommandLine>$(RsvgRustNMakeCmd) cargo-clean</NMakeCleanCommandLine>
     
<NMakeOutput>$(SolutionDir)\$(Configuration)\$(Platform)\obj\rsvg_internals\$(RustTargetArch)-pc-windows-msvc\$(Configuration)\rsvg_internals.lib</NMakeOutput>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />