aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Boutillier2015-01-13 21:22:54 +0100
committerMaxime Dénès2015-01-15 06:56:02 +0100
commitfa397ec05fdfea053470cddafd1ab09a710f5bc9 (patch)
tree4de9af81661b125e43b9ab7b602fb799ffe235d1
parent935a2a52dc5ec20f97ea6c002988c6fa292184a1 (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.build13
1 files changed, 9 insertions, 4 deletions
diff --git a/Makefile.build b/Makefile.build
index c415ce1356..0d87d98e96 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -313,11 +313,16 @@ COQIDEFLAGS=$(addprefix -I , $(IDESRCDIRS)) $(COQIDEINCLUDES)
IDEFILES=$(wildcard ide/*.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