Fix parallel make; more cleanup after build

Author: jeroen

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: hellorust
 Type: Package
 Title: Minimal Examples of Using Rust Code in R
-Version: 1.2.2
+Version: 1.2.3
 Authors@R: c(person("Jeroen", "Ooms", role = c("aut", "cre"), email = "jeroenooms@gmail.com",
     comment = c(ORCID = "0000-0002-4035-0289")),
       person("Authors of the dependency Rust crates", role = "aut", comment = "see AUTHORS file"))

NEWS

@@ -1,3 +1,6 @@
+1.2.3
+ - Fix parallel make; more cleanup after build
+
 1.2.2
  - Fix commented out CARGO_HOME in Makevars
 

hellorust.Rproj

@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: 96528bc3-6344-4293-93e2-82a0487b38a2
 
 RestoreWorkspace: Default
 SaveWorkspace: Default

src/Makevars

@@ -4,7 +4,7 @@ PKG_CFLAGS = -pthread
 PKG_CPPFLAGS = -DSTRICT_R_HEADERS -DR_NO_REMAP
 PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lresolv -pthread
 
-#all: clean
+all: $(SHLIB) cleanup
 
 $(SHLIB): $(STATLIB)
 
@@ -22,5 +22,5 @@ $(STATLIB):
 	rm -Rf $(CARGOTMP) vendor || true # CRAN wants us to remove "detritus"
 	rm -Rf $(LIBDIR)/build || true
 
-clean:
-	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) myrustlib/target
+cleanup: $(SHLIB)
+	rm -Rf $(STATLIB) myrustlib/target

src/Makevars.win

@@ -4,16 +4,13 @@ STATLIB = $(LIBDIR)/libmyrustlib.a
 PKG_CPPFLAGS = -DSTRICT_R_HEADERS -DR_NO_REMAP
 PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lws2_32 -ladvapi32 -lgdi32 -lbcrypt -lcrypt32 -luserenv -lntdll
 
-all: clean rustup
+all: $(SHLIB) cleanup
 
 $(SHLIB): $(STATLIB)
 
 $(STATLIB):
 	if [ -f myrustlib/vendor.tar.xz ]; then tar xf myrustlib/vendor.tar.xz && mkdir -p .cargo && cp myrustlib/vendor-config.toml .cargo/config.toml; fi
 	PATH="$(USERPROFILE)\.cargo\bin:$(PATH)" cargo build --target=$(TARGET) --release --manifest-path=myrustlib/Cargo.toml
 
-clean:
-	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) myrustlib/target
-
-rustup:
-	rustup target add $(TARGET) || true
+cleanup:
+	rm -Rf $(STATLIB) myrustlib/target