diff options
| author | metamuffin <metamuffin@noreply.codeberg.org> | 2024-09-25 20:44:44 +0000 |
|---|---|---|
| committer | metamuffin <metamuffin@noreply.codeberg.org> | 2024-09-25 20:44:44 +0000 |
| commit | b020cb8a0c1cb759c2c43e2f3bc9c819f8a9c3da (patch) | |
| tree | 2715ad35af38ac7813f999b8797bcb880b52b72c | |
| parent | 7bac98ee918ea9cee5eea3d446b2f204032fa03b (diff) | |
| parent | 978794cf1d255cf4ad4569e696ddcbd91abb0a7c (diff) | |
| download | hurrycurry-b020cb8a0c1cb759c2c43e2f3bc9c819f8a9c3da.tar hurrycurry-b020cb8a0c1cb759c2c43e2f3bc9c819f8a9c3da.tar.bz2 hurrycurry-b020cb8a0c1cb759c2c43e2f3bc9c819f8a9c3da.tar.zst | |
Merge pull request 'Replace usages of rm with $(RM) in makefiles' (#169) from lialenck/hurrycurry:master into master
Reviewed-on: https://codeberg.org/hurrycurry/hurrycurry/pulls/169
| -rw-r--r-- | data/makefile | 2 | ||||
| -rw-r--r-- | pixel-client/makefile | 6 | ||||
| -rw-r--r-- | test-client/makefile | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/data/makefile b/data/makefile index 23956869..af215a6c 100644 --- a/data/makefile +++ b/data/makefile @@ -26,4 +26,4 @@ recipes/%.svg: recipes/%.gv.txt dot -Tsvg -Kdot >$@<$< clean: - rm -fr recipes/*.{yaml,gv.txt,svg} + $(RM) -r recipes/*.{yaml,gv.txt,svg} diff --git a/pixel-client/makefile b/pixel-client/makefile index 764a4564..fc11d613 100644 --- a/pixel-client/makefile +++ b/pixel-client/makefile @@ -36,9 +36,9 @@ tex_pack: assets/atlas.ta tex_import: $(TEXTURES_IMPORT_PNG) tex_export: $(TEXTURES_PNG) $(SPRITES_PNG) assets/atlas.png clean: - rm -f $(PNG) - rm -fr assets/sprites - rm -f assets/atlas.ta assets/atlas.meta.csv + $(RM) $(PNG) + $(RM) -r assets/sprites + $(RM) assets/atlas.ta assets/atlas.meta.csv $(CLIENT): $(shell find src -type f) $(CLIENT_DEPS) cargo +nightly build --release --bin pixelcurry diff --git a/test-client/makefile b/test-client/makefile index 72a04791..b6c0438d 100644 --- a/test-client/makefile +++ b/test-client/makefile @@ -17,8 +17,8 @@ all: main.js locales locales: $(patsubst ../locale/%.ini,locale/%.json,$(wildcard ../locale/*.ini)) clean: - rm main.js - rm -rf locale + $(RM) main.js + $(RM) -r locale main.js: main.ts $(wildcard *.ts) esbuild $< --bundle --outfile=$@ --target=esnext --format=esm |