diff options
| author |  letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2012-08-23 12:52:35 +0000 |
|---|---|---|
| committer | letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2012-08-23 12:52:35 +0000 |
| commit | 391ecb0090e2f1eb5e991accfd766459ba5d1829 (patch) | |
| tree | 308a87ba82db5b73240792fe180f8734ed401ce4 /Makefile.common | |
| parent | f4d8159fc0078b8cb2a8a666830f7e9983818ece (diff) | |
Port from 8.4 branch some build fixes concerning win32 :
r15722:
- CAMLBIN was cygwin-specific, leading to issues with coqmktop
- A missing Filename.quote on the temp file used in coqmktop
- Try to shorten the cmdline passed to Sys.command in coqmktop:
way too many includes were passed to coqmktop -boot
r15724: Coqmktop: the +compiler-libs for ocaml4 is back
r15725: Coqmktop: better detection of ocaml 4 and above
r15739: ocamlbuild : a missing include for camlp4
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15744 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/Makefile.common b/Makefile.common index 91498c5df..4f0aa4195 100644 --- a/Makefile.common +++ b/Makefile.common @@ -68,16 +68,21 @@ COQBINARIES:= $(COQMKTOP) $(COQC) \ CSDPCERT:=plugins/micromega/csdpcert$(EXE) +CORESRCDIRS:=\ + config lib kernel kernel/byterun library \ + proofs tactics pretyping interp toplevel \ + parsing printing grammar intf + +PLUGINS:=\ + omega romega micromega quote \ + setoid_ring xml extraction fourier \ + cc funind firstorder \ + rtauto nsatz syntax decl_mode btauto + SRCDIRS:=\ - config tools tools/coqdoc scripts lib \ - kernel kernel/byterun library proofs tactics \ - pretyping interp toplevel parsing printing \ - grammar intf ide/utils ide \ - $(addprefix plugins/, \ - omega romega micromega quote \ - setoid_ring xml extraction fourier \ - cc funind firstorder \ - rtauto nsatz syntax decl_mode btauto) + $(CORESRCDIRS) \ + tools tools/coqdoc scripts ide/utils ide \ + $(addprefix plugins/, $(PLUGINS)) # Order is relevent here because kernel and checker contain files # with the same name |