commit 0926c93e3fdfbf42edc87c12ef24ab5d3ab3e7c5
parent 76cc978aaf360f8a07ead24d129948967d3ef570
Author: Vincent Forest <vincent.forest@meso-star.com>
Date: Mon, 16 Dec 2024 14:23:02 +0100
Replace target distclean with target purge
distclean was rather confusing: it didn't clean up files created by a
dist target invoked on each project, as some might have expected. The
purge target cleans up the star-build environment, not that of each
individual project. It therefore simply deletes the cache directory and
any other temporary files it creates, regardless of the build script
configured.
Diffstat:
13 files changed, 3 insertions(+), 47 deletions(-)
diff --git a/Makefile b/Makefile
@@ -32,9 +32,8 @@ clean: makefile
@$(MAKE) -f Makefile -f $(MK) clean_all
rm -rf .prefix $(MK)
-distclean: makefile
- @$(MAKE) -f Makefile -f $(MK) distclean_all
- rm -rf .prefix src/*.sh.mk
+purge:
+ rm -rf "$(CACHE)" .prefix src/*.sh.mk
uninstall: makefile
@$(MAKE) -f Makefile -f $(MK) uninstall_all
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ Clean up intermediary files:
Deep cleaning, i.e. removal of intermediate files and cached data:
- make distclean
+ make purge
Mirroring repositories to prepare for offline build
(see `NETWORK` macro in `config.mk`):
diff --git a/src/clipper2.mk.in b/src/clipper2.mk.in
@@ -71,9 +71,6 @@ uninstall_clipper2: $(CLIPPER2_DIR)
$(MAKE) install
xargs rm -f < "$(CLIPPER2_DIR)/CPP/build/install_manifest.txt"
-distclean_clipper2:
- rm -rf "$(CLIPPER2_DIR)"
-
mirror_clipper2:
repo="$$(echo "$(CLIPPER2_URL)" | sed 's/[\/]\{0,\}$$//g')" && \
repo="$(MIRROR)/$${repo##*/}" && \
@@ -82,7 +79,6 @@ mirror_clipper2:
$(CLIPPER2_URL) "$${repo}"
clean_all: clean_clipper2
-distclean_all: distclean_clipper2
install_all: clipper2
uninstall_all: uninstall_clipper2
mirror_all: mirror_clipper2
diff --git a/src/embree4.mk.in b/src/embree4.mk.in
@@ -117,9 +117,6 @@ uninstall_embree4: prefix
for i in $(EMBREE_INC); do rm -f "$${prefix}/include/embree4/$${i##*/}"; done && \
for i in $(EMBREE_DOC); do rm -f "$${prefix}/share/doc/embree4/$${i##*/}"; done
-distclean_embree4:
- rm -rf $(EMBREE_DIR)
-
mirror_embree4:
repo="$$(echo $(EMBREE_URL) | sed 's/[\/]\{0,\}$$//g')" && \
repo="$(MIRROR)/$${repo##*/}" && \
@@ -128,7 +125,6 @@ mirror_embree4:
$(EMBREE_URL) "$${repo}"
clean_all: clean_embree4
-distclean_all: distclean_embree4
install_all: embree4
uninstall_all: uninstall_embree4
mirror_all: mirror_embree4
diff --git a/src/git.mk.in b/src/git.mk.in
@@ -39,9 +39,6 @@ uninstall_@NAME@: fetch_@NAME@ prefix
cd -- "$(CACHE)/@NAME@/@TAG@" && \
$(MAKE) PREFIX="$${prefix}" uninstall
-distclean_@NAME@:
- rm -rf "$(CACHE)/@NAME@/@TAG@"
-
mirror_@NAME@:
repo="$$(echo "@URL@" | sed 's/[\/]\{0,\}$$//g')" && \
repo="$(MIRROR)/$${repo##*/}" && \
@@ -49,7 +46,6 @@ mirror_@NAME@:
git clone --bare --branch @TAG@ $(MIRROR_GIT_OPT) @URL@ "$${repo}"
clean_all: clean_@NAME@
-distclean_all: distclean_@NAME@
install_all: @NAME@
uninstall_all: uninstall_@NAME@
mirror_all: mirror_@NAME@
diff --git a/src/libcyaml.mk.in b/src/libcyaml.mk.in
@@ -47,9 +47,6 @@ uninstall_libcyaml:
rm -f "$${prefix}"/lib/libcyaml.so* && \
rm -f "$${prefix}"/lib/pkgconfig/libcyaml.pc
-distclean_libcyaml:
- rm -rf "$(LIBCYAML_DIR)"
-
mirror_libcyaml:
repo="$$(echo "$(LIBCYAML_URL)" | sed 's/[\/]\{0,\}$$//g')" && \
repo="$(MIRROR)/$${repo##*/}" && \
@@ -58,7 +55,6 @@ mirror_libcyaml:
$(LIBCYAML_URL) "$${repo}"
clean_all: clean_libcyaml
-distclean_all: distclean_libcyaml
install_all: libcyaml
uninstall_all: uninstall_libcyaml
mirror_all: mirror_libcyaml
diff --git a/src/noweb.mk.in b/src/noweb.mk.in
@@ -52,10 +52,6 @@ uninstall_noweb: fetch_noweb prefix
$(NOWEB_MAKE) uninstall &&\
rm -f "$${prefix}/lib/nwmktemp"
-distclean_noweb:
- rm -rf "$(NOWEB_DIR)"
-
clean_all: clean_noweb
-distclean_all: distclean_noweb
install_all: noweb
uninstall_all: uninstall_noweb
diff --git a/src/profile.mk.in b/src/profile.mk.in
@@ -13,9 +13,6 @@ uninstall_@NAME@: prefix
clean_@NAME@:
rm -f @NAME@
-distclean_@NAME@: clean_@NAME@
-
clean_all: clean_@NAME@
-distclean_all: distclean_@NAME@
install_all: install_@NAME@
uninstall_all: uninstall_@NAME@
diff --git a/src/random123.mk.in b/src/random123.mk.in
@@ -78,9 +78,6 @@ uninstall_random123: prefix
rm -f "$${prefix}/lib/pkgconfig/random123.pc" && \
rm -f "$${prefix}/share/doc/Random123/LICENSE"
-distclean_random123:
- rm -rf "$(RANDOM123_DIR)"
-
mirror_random123:
repo="$$(echo "$(RANDOM123_URL)" | sed 's/[\/]\{0,\}$$//g')" && \
repo="$(MIRROR)/$${repo##*/}" && \
@@ -88,7 +85,6 @@ mirror_random123:
git clone --bare --branch "$(RANDOM123_TAG)" $(MIRROR_GIT_OPT) \
$(RANDOM123_URL) "$${repo}"
-distclean_all: distclean_random123
install_all: random123
uninstall_all: uninstall_random123
mirror_all: mirror_random123
diff --git a/src/scdoc.mk.in b/src/scdoc.mk.in
@@ -45,10 +45,6 @@ uninstall_scdoc: fetch_scdoc prefix
@prefix=$$(cat .prefix) && \
cd -- "$(SCDOC_DIR)" && $(MAKE) PREFIX="$${prefix}" uninstall
-distclean_scdoc:
- rm -rf "$(SCDOC_DIR)"
-
clean_all: clean_scdoc
-distclean_all: distclean_scdoc
install_all: scdoc
uninstall_all: uninstall_scdoc
diff --git a/src/sleef.mk.in b/src/sleef.mk.in
@@ -58,10 +58,6 @@ uninstall_sleef: fetch_sleef prefix
$(MAKE) install
xargs rm -f < "$(SLEEF_DIR)/build/install_manifest.txt"
-distclean_sleef:
- rm -rf "$(SLEEF_DIR)"
-
clean_all: clean_sleef
-distclean_all: distclean_sleef
install_all: sleef
uninstall_all: uninstall_sleef
diff --git a/src/spkg.mk.in b/src/spkg.mk.in
@@ -27,15 +27,11 @@ uninstall_@NAME@: prefix
fi
rm -f "$$(cat .prefix)/share/spkg/@ARCH@.sha512sum"
-distclean_@NAME@:
- rm -rf "$(CACHE)/@ARCH@.tgz" "$(CACHE)/@ARCH@.sha512sum"
-
mirror_clean_@NAME@:
rm -rf $(MIRROR)/@ARCH@.tgz $(MIRROR)/@ARCH@.sha512sum
mirror_@NAME@: mirror_clean_@NAME@ $(MIRROR)/@ARCH@.tgz $(MIRROR)/@ARCH@.sha512sum
-distclean_all: distclean_@NAME@
install_all: @NAME@
uninstall_all: uninstall_@NAME@
mirror_all: mirror_@NAME@
diff --git a/src/tbb.mk.in b/src/tbb.mk.in
@@ -58,9 +58,6 @@ uninstall_tbb: prefix
$(MAKE) install
xargs rm -f < "$(TBB_DIR)/build/install_manifest.txt"
-distclean_tbb:
- rm -rf $(TBB_DIR)
-
mirror_tbb:
repo="$$(echo $(TBB_URL) | sed 's/[\/]\{0,\}$$//g')" && \
repo="$(MIRROR)/$${repo##*/}" && \
@@ -69,7 +66,6 @@ mirror_tbb:
$(TBB_URL) "$${repo}"
clean_all: clean_tbb
-distclean_all: distclean_tbb
install_all: tbb
uninstall_all: uninstall_tbb
mirror_all: mirror_tbb
