aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorGaëtan Gilbert2019-01-19 22:36:07 +0000
committerGaëtan Gilbert2019-01-19 22:41:02 +0000
commitdddfb9f99218dcc140c1a2904b0c8d0f11d9a279 (patch)
treeb558884cde7a8704b695adcbaa7d65cd4547de1a /Makefile
parentb2877df2c79147bd2e26e53e43291b9b29a2aab8 (diff)
Fix makefile .merlin for unit tests
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 99d4611dce..03cb51e6a3 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,8 @@ export MLPACKFILES := $(call find, '*.mlpack')
export MLGFILES := $(call find, '*.mlg')
export CFILES := $(call findindir, 'kernel/byterun', '*.c')
-MERLININFILES := $(call find, '.merlin.in')
+# NB our find wrapper ignores the test suite
+MERLININFILES := $(call find, '.merlin.in') test-suite/unit-tests/.merlin.in
export MERLINFILES := $(MERLININFILES:.in=)
# NB: The lists of currently existing .ml and .mli files will change