6 files changed, 10 insertions, 1 deletions
diff --git a/test-suite/coq-makefile/coqdoc1/run.sh b/test-suite/coq-makefile/coqdoc1/run.sh
index e071f1db7..7d82f5fae 100755
--- a/test-suite/coq-makefile/coqdoc1/run.sh
+++ b/test-suite/coq-makefile/coqdoc1/run.sh
@@ -15,6 +15,7 @@ make install-doc DSTROOT="$PWD/tmp"
 sort -u > desired <<EOT
 .
 ./test
+./test/test_plugin.cma
 ./test/test_plugin.cmi
 ./test/test_plugin.cmo
 ./test/test_plugin.cmx
diff --git a/test-suite/coq-makefile/coqdoc2/run.sh b/test-suite/coq-makefile/coqdoc2/run.sh
index e071f1db7..7d82f5fae 100755
--- a/test-suite/coq-makefile/coqdoc2/run.sh
+++ b/test-suite/coq-makefile/coqdoc2/run.sh
@@ -15,6 +15,7 @@ make install-doc DSTROOT="$PWD/tmp"
 sort -u > desired <<EOT
 .
 ./test
+./test/test_plugin.cma
 ./test/test_plugin.cmi
 ./test/test_plugin.cmo
 ./test/test_plugin.cmx
diff --git a/test-suite/coq-makefile/mlpack1/run.sh b/test-suite/coq-makefile/mlpack1/run.sh
index 418a2fb77..da4d31cdc 100755
--- a/test-suite/coq-makefile/mlpack1/run.sh
+++ b/test-suite/coq-makefile/mlpack1/run.sh
@@ -15,6 +15,7 @@ sort > desired <<EOT
 .
 ./test
 ./test/test.glob
+./test/test_plugin.cma
 ./test/test_plugin.cmi
 ./test/test_plugin.cmo
 ./test/test_plugin.cmx
diff --git a/test-suite/coq-makefile/mlpack2/run.sh b/test-suite/coq-makefile/mlpack2/run.sh
index 418a2fb77..da4d31cdc 100755
--- a/test-suite/coq-makefile/mlpack2/run.sh
+++ b/test-suite/coq-makefile/mlpack2/run.sh
@@ -15,6 +15,7 @@ sort > desired <<EOT
 .
 ./test
 ./test/test.glob
+./test/test_plugin.cma
 ./test/test_plugin.cmi
 ./test/test_plugin.cmo
 ./test/test_plugin.cmx
diff --git a/test-suite/coq-makefile/native1/run.sh b/test-suite/coq-makefile/native1/run.sh
index 097bd6398..b14327a2f 100755
--- a/test-suite/coq-makefile/native1/run.sh
+++ b/test-suite/coq-makefile/native1/run.sh
@@ -17,6 +17,7 @@ sort > desired <<EOT
 .
 ./test
 ./test/test.glob
+./test/test_plugin.cma
 ./test/test_plugin.cmi
 ./test/test_plugin.cmo
 ./test/test_plugin.cmx
diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in
index 5231899c6..fb064c495 100644
--- a/tools/CoqMakefile.in
+++ b/tools/CoqMakefile.in
@@ -184,7 +184,7 @@ CMOFILES = \
 	$(MLPACKFILES:.mlpack=.cmo)
 CMXFILES = $(CMOFILES:.cmo=.cmx)
 OFILES = $(CMXFILES:.cmx=.o)
-CMAFILES = $(MLLIBFILES:.mllib=.cma)
+CMAFILES = $(MLLIBFILES:.mllib=.cma) $(MLPACKFILES:.mlpack=.cma)
 CMXAFILES = $(CMAFILES:.cma=.cmxa)
 CMIFILES = \
 	$(CMOFILES:.cmo=.cmi) \
@@ -474,6 +474,10 @@ $(MLPACKFILES:.mlpack=.cmxs): %.cmxs: %.cmx
 	$(SHOW)'CAMLOPT -shared -o $@'
 	$(HIDE)$(CAMLOPTLINK) $(CAMLDEBUG) $(CAMLFLAGS) -shared -o $@ $<
 
+$(MLPACKFILES:.mlpack=.cma): %.cma: %.cmo | %.mlpack
+	$(SHOW)'CAMLC -a -o $@'
+	$(HIDE)$(CAMLLINK) $(CAMLDEBUG) $(CAMLFLAGS) -a -o $@ $^
+
 $(MLPACKFILES:.mlpack=.cmo): %.cmo: | %.mlpack
 	$(SHOW)'CAMLC -pack -o $@'
 	$(HIDE)$(CAMLLINK) $(CAMLDEBUG) $(CAMLFLAGS) -pack -o $@ $^