diff --git a/Makefile b/Makefile index cce3960e3b87149f91dff175567f1bfd1a29733a..fa51a2f76603c5121c6817f59fc307b8184c79ab 100644 --- a/Makefile +++ b/Makefile @@ -12,29 +12,20 @@ clean: Makefile.coq Makefile.coq: _CoqProject Makefile coq_makefile -f _CoqProject | sed 's/$$(COQCHK) $$(COQCHKFLAGS) $$(COQLIBS)/$$(COQCHK) $$(COQCHKFLAGS) $$(subst -Q,-R,$$(COQLIBS))/' > Makefile.coq -# Initialize local Iris dependency -iris-local-init: clean - git submodule update --init iris - ln -nsf iris iris-enabled - -# Build local Iris dependency +# Use local Iris dependency iris-local: - +make -C iris -f Makefile + git submodule update --init iris # If not initialized, then initialize; If not updated with this remote, then update + ln -nsf iris iris-enabled # If not linked, then link + +make -C iris -f Makefile # If not built, then build -# Initialize global Iris dependency -iris-system-init: clean +# Use system-installed Iris dependency +iris-system: clean rm -f iris-enabled -# Update local Iris dependency -iris-local-update: - git submodule update --remote --merge - - _CoqProject: ; Makefile: ; phony: ; -.PHONY: all clean phony iris-local iris-local-init iris-system-init - +.PHONY: all clean phony iris-local iris-system diff --git a/README.md b/README.md index a83b6ccd6dd243b1bda8752055ae6cc1df4e9c68..d313458f637f247b91bee6670a8d1043e0659d11 100644 --- a/README.md +++ b/README.md @@ -24,3 +24,7 @@ version), run `make iris-local`. Run this command again later to update the local Iris, in case the preferred Iris version changed. Now run `make` to build the full development. + +## Update local dependency by tracking Iris `master` + + git submodule update --remote