diff options
| author |  Enrico Tassi <Enrico.Tassi@inria.fr> | 2014-06-25 17:04:35 +0200 |
|---|---|---|
| committer | Enrico Tassi <Enrico.Tassi@inria.fr> | 2014-06-25 17:04:35 +0200 |
| commit | 753b8f4aaa78fe1cf8ea033d8cf45e88b5da9d13 (patch) | |
| tree | 66ef0fdf8f9152d0740b1f875d80343bac1ae4af /Makefile.common | |
| parent | 0a829ad04841d0973b22b4407b95f518276b66e7 (diff) | |
all coqide specific files moved into ide/
lib/interface split into:
- lib/feedback
subscribe-based feedback bus (also used by coqidetop)
- ide/interface
definition of coqide protocol messages
lib/pp
structured info/err/warn messages
lib/serialize split into:
- lib/serialize
generic xml serialization (list, pairs, int, loc, ...)
used by coqide but potentially useful to other interfaces
- ide/xmlprotocol
serialization of protocol messages as in ide/interface
the only drawback is that coqidetop needs -thread
and I had to pass that option to all files in ide/
Diffstat (limited to 'Makefile.common')
| -rw-r--r-- | Makefile.common | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.common b/Makefile.common index 4b6cc764a..8a70273ad 100644 --- a/Makefile.common +++ b/Makefile.common @@ -72,11 +72,10 @@ PLUGINS:=\ SRCDIRS:=\ $(CORESRCDIRS) \ - tools tools/coqdoc idetop\ + tools tools/coqdoc \ $(addprefix plugins/, $(PLUGINS)) -IDESRCDIRS:=\ - config lib ide/utils ide +IDESRCDIRS:= $(CORESRCDIRS) ide ide/utils # Order is relevent here because kernel and checker contain files # with the same name @@ -214,7 +213,7 @@ LINKCMX:=$(CORECMA:.cma=.cmxa) $(STATICPLUGINS:.cma=.cmxa) IDEDEPS:=lib/clib.cma lib/xml_lexer.cmo lib/xml_parser.cmo lib/xml_printer.cmo lib/errors.cmo lib/spawn.cmo IDECMA:=ide/ide.cma -IDETOPLOOPCMA=idetop/coqidetop.cma +IDETOPLOOPCMA=ide/coqidetop.cma LINKIDE:=$(IDEDEPS) $(IDECMA) ide/coqide_main.ml LINKIDEOPT:=$(IDEOPTDEPS) $(patsubst %.cma,%.cmxa,$(IDEDEPS:.cmo=.cmx)) $(IDECMA:.cma=.cmxa) ide/coqide_main.ml @@ -227,7 +226,7 @@ IDEMOD:=$(shell cat ide/ide.mllib) # coqmktop, coqc -COQENVCMO:=lib/clib.cma lib/loc.cmo lib/errors.cmo +COQENVCMO:=lib/clib.cma lib/errors.cmo COQMKTOPCMO:=$(COQENVCMO) tools/tolink.cmo tools/coqmktop.cmo |