diff options
| author |  letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2011-03-25 17:35:47 +0000 |
|---|---|---|
| committer | letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2011-03-25 17:35:47 +0000 |
| commit | 27e9777aaadca805dd331bc5f4f6ce40d41fbd70 (patch) | |
| tree | cd546e38133d1c32d97c0da314a5bdbafdc5322e /Makefile.common | |
| parent | bac77d6d0e58c74e2ad8ca439c48b86df5587206 (diff) | |
Ide: more reorganisation and cleanup
- Avoid using Util which depends on Compat and hence Camlp4
- Instead, a small Minilib module specific to coqide, which
duplicate 5 functions from Util (50 lines)
- some dead code removal
- the coqlib variable is asked to coqtop
- remove obsolete Util.check_for_interrupt
This way, coqide only depends on 3 files outside ide/ :
Coq_config, Flags, Ide_intf. Makefile and ocamlbuild are adapted
accordingly.
TODO: how should we signal coqide error, warnings, etc ?
For the moment, some Printf.eprintf, some failwith.
To uniformize later...
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@13930 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/Makefile.common b/Makefile.common index c51ca4011..ce99603fe 100644 --- a/Makefile.common +++ b/Makefile.common @@ -217,15 +217,11 @@ INITPLUGINSBEST:=$(if $(OPT),$(INITPLUGINSOPT),$(INITPLUGINS)) LINKCMO:=$(CONFIG) $(CORECMA) $(STATICPLUGINS) LINKCMX:=$(CONFIG:.cmo=.cmx) $(CORECMA:.cma=.cmxa) $(STATICPLUGINS:.cma=.cmxa) -LIBCMA:=lib/lib.cma +IDEDEPS:=$(CONFIG) lib/flags.cmo toplevel/ide_intf.cmo IDECMA:=ide/ide.cma -IDEINTF:=toplevel/ide_intf.cmo -IDELIBS:=$(CONFIG) $(LIBCMA) $(IDEINTF) $(IDECMA) -IDELIBSOPT:=$(subst .cmo,.cmx,$(IDELIBS:.cma=.cmxa)) - -LINKIDE:=$(IDELIBS) ide/coqide_main.ml -LINKIDEOPT:=$(IDEOPTDEPS) $(IDELIBSOPT) ide/coqide_main_opt.ml +LINKIDE:=$(IDEDEPS) $(IDECMA) ide/coqide_main.ml +LINKIDEOPT:=$(IDEDEPS:.cmo=.cmx) $(IDECMA:.cma=.cmxa) ide/coqide_main_opt.ml # modules known by the toplevel of Coq |