Fix parallel make; cleanup after build

Author: jeroen

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: gifski
 Type: Package
 Title: Highest Quality GIF Encoder
-Version: 1.32.0-1
+Version: 1.32.0-2
 Authors@R: c(
     person("Jeroen", "Ooms", ,"[email protected]", role = c("aut", "cre"),
       comment = c(ORCID = "0000-0002-4035-0289")),

NEWS

@@ -1,3 +1,6 @@
+1.32.0-2
+  - Fix parallel make; cleanup after build
+
 1.32.0
   - Update embedded libgifski to upstream 1.32.0
 

gifski.Rproj

@@ -1,4 +1,5 @@
 Version: 1.0
+ProjectId: bddc0489-96c5-4eab-bfcd-73fb3dd26e8c
 
 RestoreWorkspace: Default
 SaveWorkspace: Default

src/Makevars

@@ -3,7 +3,8 @@ STATLIB = $(LIBDIR)/libmyrustlib.a
 PKG_CFLAGS = -pthread $(C_VISIBILITY)
 PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lresolv -pthread
 
-#all: clean
+all: $(SHLIB) cleanup
+
 $(SHLIB): $(STATLIB)
 
 # CRAN wants to avoid writing in $HOME
@@ -16,5 +17,5 @@ $(STATLIB):
 	rm -Rf $(CARGO_HOME) vendor || true
 	rm -Rf $(LIBDIR)/build || true
 
-clean:
-	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) myrustlib/target
+cleanup: $(SHLIB)
+	rm -Rf $(STATLIB) myrustlib/target

src/Makevars.ucrt

@@ -3,7 +3,7 @@ LIBDIR = myrustlib/target/$(TARGET)/release
 STATLIB = $(LIBDIR)/libmyrustlib.a
 PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt -lntdll
 
-all: clean
+all: $(SHLIB) cleanup
 
 $(SHLIB): $(STATLIB)
 
@@ -13,5 +13,5 @@ $(STATLIB):
 	PATH="$(USERPROFILE)\\.cargo\\bin:$(PATH)" cargo build --target=$(TARGET) --release --manifest-path=myrustlib/Cargo.toml
 	rm -Rf $(LIBDIR)/build
 
-clean:
-	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) myrustlib/target
+cleanup: $(SHLIB)
+	rm -Rf $(STATLIB) myrustlib/target