From fa397ec05fdfea053470cddafd1ab09a710f5bc9 Mon Sep 17 00:00:00 2001 From: Pierre Boutillier Date: Tue, 13 Jan 2015 21:22:54 +0100 Subject: 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) --- Makefile.build | 13 +++++++++---- 1 file 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 -- cgit v1.2.3