Fix fast-autogenerated-deps target

Also add a kludge to override the .v.d targets of the relevant files.
It unfortunately spews a lot of makefile output, but it's better than
the target not working at all.  When the target is not passed, the
behavior is unchanged.

1 files changed, 8 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 000675b44..027e9f105 100644
--- a/Makefile
+++ b/Makefile
@@ -81,6 +81,7 @@ REGULAR_VOFILES := $(filter-out $(SPECIAL_VOFILES) $(UNMADE_VOFILES),$(VOFILES))
 CURVES_PROOFS_PRE_VOFILES := $(filter src/Curves/%Proofs.vo,$(REGULAR_VOFILES))
 NO_CURVES_PROOFS_UNMADE_VOFILES := src/Curves/Weierstrass/AffineProofs.vo
 NO_CURVES_PROOFS_NON_SPECIFIC_UNMADE_VOFILES := src/Curves/Weierstrass/AffineProofs.vo src/Specific/%.vo
+REAL_SPECIFIC_GENERATED_VOFILES := $(filter $(SPECIFIC_GENERATED_VOFILES),$(VOFILES))
 
 SELECTED_PATTERN := \
 	src/Specific/X25519/C64/% \
@@ -150,12 +151,17 @@ regenerate-curves::
 .PHONY: src/Specific/.autgenerated-deps
 src/Specific/.autgenerated-deps:
 	$(SHOW)'COQDEP $@'
-	$(HIDE)$(COQDEP) $(COQLIBS) -dyndep var -c $(SPECIFIC_GENERATED_VOFILES:.vo=.v) $(redir_if_ok)
+	$(HIDE)$(COQDEP) $(COQLIBS) -dyndep var -c $(REAL_SPECIFIC_GENERATED_VOFILES:.vo=.v) $(redir_if_ok)
 
 .PHONY: fast-autogenerated-deps
 fast-autogenerated-deps: src/Specific/.autgenerated-deps
 	$(SHOW)'CP .v.d'
-	$(HIDE)for i in $(SPECIFIC_GENERATED_VOFILES:.vo=.v.d); do cp -f src/Specific/.autgenerated-deps $$i; done
+	$(HIDE)for i in $(REAL_SPECIFIC_GENERATED_VOFILES:.vo=.v.d); do rm -f $$i; ln -s src/Specific/.autgenerated-deps $$i; done
+
+ifneq ($(filter fast-autogenerated-deps,$(MAKECMDGOALS)),)
+$(REAL_SPECIFIC_GENERATED_VOFILES:.vo=.v.d): fast-autogenerated-deps
+	@ true
+endif
 
 printlite::
 	@echo 'Files Made:'