diff options
| author | Pierre Boutillier | 2015-01-13 21:22:54 +0100 |
|---|---|---|
| committer | Pierre Boutillier | 2015-01-14 09:55:44 +0100 |
| commit | 39dbaf95e1a433e3b3fcea08935d243d01833656 (patch) | |
| tree | 0152099ffa4782dc0c4bc3332ec9aff12473d708 | |
| parent | 53bd823e61ed0bac8f08d6b514be18f6c503f695 (diff) | |
Always build (even when -coqide no) and install idetoploop
So you can link a coqtop compiled (by opam) without coqide to a stand alone coqide (binary distributed)
| -rw-r--r-- | Makefile.build | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.build b/Makefile.build index f4b5a63ae1..c5c830993c 100644 --- a/Makefile.build +++ b/Makefile.build @@ -313,11 +313,16 @@ COQIDEFLAGS=$(addprefix -I , $(IDESRCDIRS)) $(COQIDEINCLUDES) IDEFILES=$(wildcard ide/coq*.lang) ide/coq_style.xml ide/coq.png ide/MacOS/default_accel_map -coqide-binaries: coqide-$(HASCOQIDE) +coqide-binaries: coqide-$(HASCOQIDE) ide-toploop coqide-no: -coqide-byte: $(COQIDEBYTE) $(COQIDE) $(IDETOPLOOPCMA) -coqide-opt: $(COQIDEBYTE) $(COQIDE) $(IDETOPLOOPCMA) $(IDETOPLOOPCMA:.cma=.cmxs) +coqide-byte: $(COQIDEBYTE) $(COQIDE) +coqide-opt: $(COQIDEBYTE) $(COQIDE) coqide-files: $(IDEFILES) +ifeq ($(BEST),opt) +ide-toploop: $(IDETOPLOOPCMA) $(IDETOPLOOPCMA:.cma=.cmxs) +else +ide-toploop: $(IDETOPLOOPCMA) +endif ifeq ($(HASCOQIDE),opt) $(COQIDE): $(LINKIDEOPT) @@ -340,7 +345,7 @@ $(COQIDEBYTE): $(LINKIDE) .PHONY: install-coqide install-ide-bin install-ide-toploop install-ide-files install-ide-info install-ide-devfiles ifeq ($(HASCOQIDE),no) -install-coqide: +install-coqide: install-ide-toploop else install-coqide: install-ide-bin install-ide-toploop install-ide-files install-ide-info install-ide-devfiles endif |