diff options
| author | Emilio Jesus Gallego Arias | 2018-11-14 13:59:13 +0100 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2018-11-14 13:59:13 +0100 |
| commit | 9896b66fabdb1dacafb71887b85facefa91845e7 (patch) | |
| tree | 6a59bf13b746dd76ff03ac83f6105fa18866d04a | |
| parent | 94494770254bec236f2f6fe727ae42b79192afe4 (diff) | |
| parent | ea68d3e92405760a453668c7f471e5c587884d80 (diff) | |
Merge PR #8966: coq_makefile: Fix ocamldep ignoring mlg files
| -rw-r--r-- | test-suite/coq-makefile/camldep/_CoqProject | 4 | ||||
| -rwxr-xr-x | test-suite/coq-makefile/camldep/run.sh | 17 | ||||
| -rw-r--r-- | tools/CoqMakefile.in | 3 |
3 files changed, 24 insertions, 0 deletions
diff --git a/test-suite/coq-makefile/camldep/_CoqProject b/test-suite/coq-makefile/camldep/_CoqProject new file mode 100644 index 0000000000..0b7ebd14e4 --- /dev/null +++ b/test-suite/coq-makefile/camldep/_CoqProject @@ -0,0 +1,4 @@ +-Q . Foo +-I src +src/file1.mlg +src/file2.ml diff --git a/test-suite/coq-makefile/camldep/run.sh b/test-suite/coq-makefile/camldep/run.sh new file mode 100755 index 0000000000..aa62ee56eb --- /dev/null +++ b/test-suite/coq-makefile/camldep/run.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +set -e +export PATH=$COQBIN:$PATH +export LC_ALL=C + +rm -rf _test +mkdir _test +cp _CoqProject _test/ +cd _test +mkdir src + +echo '{ let foo = () }' > src/file1.mlg +echo 'let bar = File1.foo' > src/file2.ml +coq_makefile -f _CoqProject -o Makefile +make src/file2.cmx +[ -f src/file2.cmx ] diff --git a/tools/CoqMakefile.in b/tools/CoqMakefile.in index e3fa0c24fe..92cc820483 100644 --- a/tools/CoqMakefile.in +++ b/tools/CoqMakefile.in @@ -719,6 +719,9 @@ endif redir_if_ok = > "$@" || ( RV=$$?; rm -f "$@"; exit $$RV ) +GENMLFILES:=$(MLGFILES:.mlg=.ml) $(ML4FILES:.ml4=.ml) +$(addsuffix .d,$(ALLSRCFILES)): $(GENMLFILES) + $(addsuffix .d,$(MLIFILES)): %.mli.d: %.mli $(SHOW)'CAMLDEP $<' $(HIDE)$(CAMLDEP) $(OCAMLLIBS) "$<" $(redir_if_ok) |