Skip to content
Snippets Groups Projects
Commit ce12f3a6 authored by Ralf Jung's avatar Ralf Jung
Browse files

Merge branch 'fix-makefile' into 'master'

Makefile: fix recursive invocation to use `$(MAKE)`

See merge request iris/iris!561
parents 29aa3576 b1da9a23
No related branches found
No related tags found
No related merge requests found
# Default target # Default target
all: Makefile.coq all: Makefile.coq
+@make -f Makefile.coq all +@$(MAKE) -f Makefile.coq all
.PHONY: all .PHONY: all
# Permit local customization # Permit local customization
...@@ -9,12 +9,12 @@ all: Makefile.coq ...@@ -9,12 +9,12 @@ all: Makefile.coq
# Forward most targets to Coq makefile (with some trick to make this phony) # Forward most targets to Coq makefile (with some trick to make this phony)
%: Makefile.coq phony %: Makefile.coq phony
@#echo "Forwarding $@" @#echo "Forwarding $@"
+@make -f Makefile.coq $@ +@$(MAKE) -f Makefile.coq $@
phony: ; phony: ;
.PHONY: phony .PHONY: phony
clean: Makefile.coq clean: Makefile.coq
+@make -f Makefile.coq clean +@$(MAKE) -f Makefile.coq clean
find theories tests exercises solutions \( -name "*.d" -o -name "*.vo" -o -name "*.vo[sk]" -o -name "*.aux" -o -name "*.cache" -o -name "*.glob" -o -name "*.vio" \) -print -delete || true find theories tests exercises solutions \( -name "*.d" -o -name "*.vo" -o -name "*.vo[sk]" -o -name "*.aux" -o -name "*.cache" -o -name "*.glob" -o -name "*.vio" \) -print -delete || true
rm -f Makefile.coq .lia.cache builddep/* rm -f Makefile.coq .lia.cache builddep/*
.PHONY: clean .PHONY: clean
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment