From 22d89ef234ba7d5bc0fd0d3d5d1e18e0a8fa1429 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 3 Mar 2019 08:36:31 +0000 Subject: [PATCH] projects-dir.mk: Make clean target less aggressive The clean target now doesn't remove meta files which enforce a new pull if absent. distclean is the new clean. Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 146e9905..67f3b6f8 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -127,7 +127,7 @@ CVS_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /CVS,$(BUIL all: $(filter-out $(UNAVAILABLE_TARGETS),pull.done links.done) $(TIME) $(PROJECTS_PY_BUILD) $@ $(TARGET_PROJECTS) -clean: clean-dirs done.clean +clean: clean-dirs distclean: clean-all-dirs done.clean install: @echo @@ -175,7 +175,7 @@ echo-excludes: edit-%: | $(TEXT_FILES_CACHE) $(EDITOR) $(shell grep "/$*$$" $(TEXT_FILES_CACHE)) -clean: clean.text-files-cache +distclean: clean.text-files-cache clean.text-files-cache: rm -f $(TEXT_FILES_CACHE) list-files: @@ -219,7 +219,7 @@ pkg-exclude-built-today: $(JW_PKG) built-today > built-today.tmp cat $(EXCLUDES_FILE) built-today.tmp | sed 's/ */\n/g' | sort -u > $(EXCLUDES_FILE).tmp mv $(EXCLUDES_FILE).tmp $(EXCLUDES_FILE) -clean: clean.pkg-exclude-built-today +distclean: clean.pkg-exclude-built-today clean.pkg-exclude-built-today: rm -f $(EXCLUDES_FILE).tmp built-today.tmp @@ -251,6 +251,7 @@ clean-dirs: clean-all-dirs: $(PROJECTS_PY_BUILD) clean $(PROJECTS) + make clean-dirs purge: $(SSH_WRAPPER_SH) ifneq ($(wildcard CVS),) @@ -377,7 +378,7 @@ $(SSH_WRAPPER_SH): Makefile ssh-wrapper: $(SSH_WRAPPER_SH) clean.ssh-wrapper: rm -f $(SSH_WRAPPER_SH) -clean: clean.ssh-wrapper +distclean: clean.ssh-wrapper define check_cvs_user @if ! grep -q ":ext:$(JANWARE_USER)@" CVS/Root; then \