From a1ed9f2606df0a818e3ad59b0a72e0d0accee880 Mon Sep 17 00:00:00 2001 From: Ralf Jung <jung@mpi-sws.org> Date: Sat, 23 Jun 2018 00:18:28 +0200 Subject: [PATCH] update Makefile and CI --- Makefile | 4 ++-- ci | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e089b03f..e15b27a3 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ all: Makefile.coq clean: Makefile.coq +@make -f Makefile.coq clean - find theories \( -name "*.v.d" -o -name "*.vo" -o -name "*.aux" -o -name "*.cache" -o -name "*.glob" -o -name "*.vio" \) -print -delete + find theories $$(test -d tests && echo tests) \( -name "*.v.d" -o -name "*.vo" -o -name "*.aux" -o -name "*.cache" -o -name "*.glob" -o -name "*.vio" \) -print -delete rm -f Makefile.coq .PHONY: clean @@ -33,7 +33,7 @@ build-dep: build-dep/opam phony @# dependencies, but does not actually install anything. @# Reinstalling is needed with opam 1 in case the pin already exists, but the builddep @# package changed. - @BUILD_DEP_PACKAGE="$$(egrep "^name:" build-dep/opam | sed 's/^name: *"\(.*\)" */\1/')"; \ + @BUILD_DEP_PACKAGE="$$(egrep "^name:" build-dep/opam | sed 's/^name: *"\(.*\)" */\1/')" && \ echo "# Pinning build-dep package." && \ opam pin add -k path $(OPAMFLAGS) "$$BUILD_DEP_PACKAGE".dev build-dep && \ ((! opam --version | grep "^1\." > /dev/null) || ( \ diff --git a/ci b/ci index 99c935d2..1664067b 160000 --- a/ci +++ b/ci @@ -1 +1 @@ -Subproject commit 99c935d2007358fe4028560e96f9c136e608e696 +Subproject commit 1664067bf3f01bd7a081874d26c21e26ad2a3bbf -- GitLab