From 36613c83d65aa821b01a9fac38c479af65ef3589 Mon Sep 17 00:00:00 2001
From: Kazuhiko Sakaguchi
Date: Tue, 16 Jun 2020 02:11:03 +0900
Subject: Fix some Makefile issues and rename `hierarchy_test.v` to
 `test_hierarchy_all.v`

---
 mathcomp/Makefile.common | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'mathcomp/Makefile.common')

diff --git a/mathcomp/Makefile.common b/mathcomp/Makefile.common
index 857ddef..b6b71ea 100644
--- a/mathcomp/Makefile.common
+++ b/mathcomp/Makefile.common
@@ -56,11 +56,10 @@ Makefile.coq: pre-makefile $(COQPROJECT) Makefile
 
 # Test suite ---------------------------------------------------------
 
-test_suite/hierarchy_test.v: build
-	mkdir -p test_suite
-	COQBIN=$(COQBIN) ocaml ../etc/utils/hierarchy.ml -verify -R . mathcomp -lib all.all > test_suite/hierarchy_test.v
+test_suite/test_hierarchy_all.v: build
+	COQBIN=$(COQBIN) ocaml ../etc/utils/hierarchy.ml -verify -R . mathcomp -lib all.all > test_suite/test_hierarchy_all.v
 
-Makefile.test-suite.coq: test_suite/hierarchy_test.v
+Makefile.test-suite.coq: test_suite/test_hierarchy_all.v
 	$(COQMAKEFILE) $(COQMAKEFILEOPTIONS) -f Make.test-suite -o Makefile.test-suite.coq
 
 # Global config, build, clean and distclean --------------------------
@@ -128,6 +127,9 @@ endif
 %.vo: __always__ Makefile.coq
 	+$(COQMAKE) $@
 
+test_suite/%.vo: __always__ Makefile.test-suite.coq
+	+$(COQMAKE_TESTSUITE) $@
+
 doc: __always__ Makefile.coq
 	mkdir -p _build_doc/
 	cp -r $(COQFILES) -t _build_doc/ --parents
-- 
cgit v1.2.3