aboutsummaryrefslogtreecommitdiffhomepage
path: root/scripts
diff options
context:
space:
mode:
authorGravatar barras <barras@85f007b7-540e-0410-9357-904b9bb8a0f7>2004-01-26 17:56:10 +0000
committerGravatar barras <barras@85f007b7-540e-0410-9357-904b9bb8a0f7>2004-01-26 17:56:10 +0000
commit4668b4127e62875e0d766b234f964d15cde3e0e8 (patch)
treeb052dd07f33c3d22cb02c7726a8fabf5203f9ebd /scripts
parentfa9dbd3b48f23c2b0214322f3c50306b6c3af5c6 (diff)
deplacement des cma et cmxa dans les sous-repertoires
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@5249 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'scripts')
-rw-r--r--scripts/coqmktop.ml14
1 files changed, 9 insertions, 5 deletions
diff --git a/scripts/coqmktop.ml b/scripts/coqmktop.ml
index acc5922ea..608c5259e 100644
--- a/scripts/coqmktop.ml
+++ b/scripts/coqmktop.ml
@@ -44,8 +44,9 @@ let core_objs =
proofs @ tactics
let core_libs =
- libobjs @ [ "lib.cma" ; "kernel.cma" ; "library.cma" ; "pretyping.cma" ;
- "interp.cma" ; "parsing.cma" ; "proofs.cma" ; "tactics.cma" ]
+ libobjs @ [ "lib/lib.cma" ; "kernel/kernel.cma" ; "library/library.cma" ;
+ "pretyping/pretyping.cma" ; "interp/interp.cma" ; "parsing/parsing.cma" ;
+ "proofs/proofs.cma" ; "tactics/tactics.cma" ]
(* 3. Files only in coqsearchisos (if option -searchisos is used) *)
let coqsearch = ["version_searchisos.cmo"; "cmd_searchisos_line.cmo"]
@@ -109,7 +110,8 @@ let files_to_link userfiles =
else []
in
let ide_libs = if !coqide then
- ["str.cma" ; "threads.cma" ; "lablgtk.cma" ; "gtkThread.cmo" ; "ide.cma" ]
+ ["str.cma" ; "threads.cma" ; "lablgtk.cma" ; "gtkThread.cmo" ;
+ "ide/ide.cma" ]
else []
in
let objs =
@@ -117,8 +119,10 @@ let files_to_link userfiles =
command_objs @ hightactics @ toplevel_objs @ ide_objs
and libs =
core_libs @ dyn_objs @
- [ "toplevel.cma" ; "highparsing.cma" ; "highparsingnew.cma" ] @
- command_objs @ [ "hightactics.cma" ; "contrib.cma" ] @ toplevel_objs @
+ [ "toplevel/toplevel.cma" ; "parsing/highparsing.cma" ;
+ "parsing/highparsingnew.cma" ] @
+ command_objs @ [ "tactics/hightactics.cma" ; "contrib/contrib.cma" ] @
+ toplevel_objs @
ide_libs
in
let objstolink,libstolink =