From cbbd8011e3b17a09c15f348bdf587f9b15f716d3 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sat, 15 Jun 2019 10:22:19 +0000 Subject: [PATCH] projects-dir.mk: Remove links.done machinery Remove legacy links.done, since dspider-shared and dspider-btools are now converted to git projects below the toplevel directory. Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index fa219607..1dc8d601 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -132,7 +132,7 @@ CVS_PROJECTS = $(patsubst %/,%,$(dir $(wildcard $(addsuffix /CVS # --- mandatory targets -all: $(filter-out $(UNAVAILABLE_TARGETS),pull.done links.done) +all: $(filter-out $(UNAVAILABLE_TARGETS),pull.done) $(TIME) $(PROJECTS_PY_BUILD) $@ $(TARGET_PROJECTS) clean: clean-dirs distclean: clean-all-dirs done.clean @@ -378,11 +378,6 @@ git-check-conv: $(SSH_WRAPPER_SH) # --- rules -links.done: - if [ -d btools ]; then ln -sf btools dspider-btools; fi - if [ -d dspc/src/shared ]; then ln -sf dspc/src/shared dspider-shared; fi - touch $@ - $(SSH_WRAPPER_SH): Makefile /bin/echo -e '#!/bin/bash $(SSH_WRAPPER_TRACE)\n\nexec /usr/bin/ssh $$JW_BUILD_SSH_EXTRA_OPTS "$$@"' > $@.tmp chmod 700 $@.tmp @@ -415,7 +410,7 @@ cvs-update.done: cvsdir.done $(SSH_WRAPPER_SH) update.done: purge -pull.done: $(filter-out $(UNAVAILABLE_TARGETS),cvs-update.done clone.done links.done) +pull.done: $(filter-out $(UNAVAILABLE_TARGETS),cvs-update.done clone.done) touch $@ clone.done: $(filter-out $(UNAVAILABLE_TARGETS),$(SSH_WRAPPER_SH))