diff --git a/Makefile b/Makefile index 8bf123000160fd65bcbd3455f67d536825f33081..8d615e4b2c9081e20b16fb3931cea5ef951c540c 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ all: Makefile.coq clean: Makefile.coq +@make -f Makefile.coq clean find theories tests \( -name "*.d" -o -name "*.vo" -o -name "*.aux" -o -name "*.cache" -o -name "*.glob" -o -name "*.vio" \) -print -delete || true - rm -f Makefile.coq + rm -f Makefile.coq .lia.cache .PHONY: clean # Create Coq Makefile. @@ -29,14 +29,8 @@ build-dep: build-dep/opam phony @# that are incompatible with our build requirements. @# To achieve this, we create a fake opam package that has our build-dependencies as @# dependencies, but does not actually install anything itself. - @echo "# Pinning build-dep package." && \ - if opam --version | grep "^1\." -q; then \ - BUILD_DEP_PACKAGE="$$(egrep "^name:" build-dep/opam | sed 's/^name: *"\(.*\)" */\1/')" && \ - opam pin add -k path $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE".dev build-dep && \ - opam reinstall $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE"; \ - else \ - opam install $(OPAMFLAGS) build-dep/; \ - fi + @echo "# Installing build-dep package." + @opam install $(OPAMFLAGS) build-dep/ # Some files that do *not* need to be forwarded to Makefile.coq Makefile: ;