Skip to content

Commit 5059127

Browse files
chore: Cleanup build process and remove unnecessary files (#440)
* chore: further cleanup after build process * fix typo
1 parent eaf724d commit 5059127

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

inst/templates/Makevars.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ STATLIB = $(LIBDIR)/lib{{{lib_name}}}.a
44
PKG_LIBS = -L$(LIBDIR) -l{{{lib_name}}}
55

66
all: $(SHLIB) rust_clean
7+
rm -f $(CURDIR)/Makevars
78

89
.PHONY: $(STATLIB)
910

@@ -39,4 +40,4 @@ rust_clean: $(SHLIB)
3940
rm -Rf $(CARGOTMP) $(VENDOR_DIR) @CLEAN_TARGET@
4041

4142
clean:
42-
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR)
43+
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) $(VENDOR_DIR)

inst/templates/Makevars.win.in

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ STATLIB = $(LIBDIR)/lib{{{lib_name}}}.a
66
PKG_LIBS = -L$(LIBDIR) -l{{{lib_name}}} -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll
77

88
all: $(SHLIB) rust_clean
9+
rm -f $(CURDIR)/Makevars.win
910

1011
.PHONY: $(STATLIB)
1112

@@ -36,4 +37,4 @@ rust_clean: $(SHLIB)
3637
rm -Rf $(CARGOTMP) $(VENDOR_DIR) @CLEAN_TARGET@
3738

3839
clean:
39-
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR)
40+
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) $(VENDOR_DIR)

tests/testthat/_snaps/use_extendr.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@
197197
PKG_LIBS = -L$(LIBDIR) -ltestpkg
198198
199199
all: $(SHLIB) rust_clean
200+
rm -f $(CURDIR)/Makevars
200201
201202
.PHONY: $(STATLIB)
202203
@@ -232,7 +233,7 @@
232233
rm -Rf $(CARGOTMP) $(VENDOR_DIR) @CLEAN_TARGET@
233234
234235
clean:
235-
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR)
236+
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) $(VENDOR_DIR)
236237

237238
---
238239

@@ -261,6 +262,7 @@
261262
PKG_LIBS = -L$(LIBDIR) -ltestpkg -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll
262263
263264
all: $(SHLIB) rust_clean
265+
rm -f $(CURDIR)/Makevars.win
264266
265267
.PHONY: $(STATLIB)
266268
@@ -291,7 +293,7 @@
291293
rm -Rf $(CARGOTMP) $(VENDOR_DIR) @CLEAN_TARGET@
292294
293295
clean:
294-
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR)
296+
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) $(VENDOR_DIR)
295297

296298
---
297299

@@ -417,6 +419,7 @@
417419
PKG_LIBS = -L$(LIBDIR) -lbar
418420
419421
all: $(SHLIB) rust_clean
422+
rm -f $(CURDIR)/Makevars
420423
421424
.PHONY: $(STATLIB)
422425
@@ -452,5 +455,5 @@
452455
rm -Rf $(CARGOTMP) $(VENDOR_DIR) @CLEAN_TARGET@
453456
454457
clean:
455-
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR)
458+
rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) $(TARGET_DIR) $(VENDOR_DIR)
456459

0 commit comments

Comments
 (0)