From 733e71e33288c2a52d2a0c30b30471fd65631055 Mon Sep 17 00:00:00 2001
From: Guillaume Bury <guillaume.bury@gmail.com>
Date: Wed, 25 Jan 2017 17:09:41 +0100
Subject: [PATCH] [opam] Update opam file to add doc building

---
 Makefile | 44 +++++++++++++-------------------------------
 opam     |  7 +++++--
 2 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/Makefile b/Makefile
index 6fbc8a0d..b1fd3796 100644
--- a/Makefile
+++ b/Makefile
@@ -7,18 +7,9 @@ DOC=src/msat.docdir/index.html
 BIN=main.native
 TEST_BIN=tests/test_api.native
 
-NAME_OCAMLFIND=msat
-NAME_BIN=msat
-NAME_CORE=msat
-#NAME_SAT=msat_sat
-#NAME_SMT=msat_smt
-#NAME_MCSAT=msat_mcsat
+NAME=msat
 
-LIB_CORE=$(addprefix $(NAME_CORE), .cma .cmxa .cmxs)
-#LIB_SAT=$(addprefix $(NAME_SAT), .cma .cmxa .cmxs)
-#LIB_SMT=$(addprefix $(NAME_SMT), .cma .cmxa .cmxs)
-#LIB_MCSAT=$(addprefix $(NAME_MCSAT), .cma .cmxa .cmxs)
-LIB=$(LIB_CORE) # $(LIB_SAT) $(LIB_SMT) $(LIB_MCSAT)
+LIB=$(addprefix $(NAME), .cma .cmxa .cmxs)
 
 all: lib test
 
@@ -30,7 +21,7 @@ doc:
 
 bin:
 	$(COMP) $(FLAGS) $(BIN)
-	cp $(BIN) $(NAME_BIN) && rm $(BIN)
+	cp $(BIN) $(NAME) && rm $(BIN)
 
 test_bin:
 	$(COMP) $(FLAGS) $(TEST_BIN)
@@ -48,33 +39,24 @@ enable_log:
 disable_log:
 	cd src/util; ln -sf log_dummy.ml log.ml
 
-log:
-	cat _build/$(LOG) || true
-
 clean:
 	$(COMP) -clean
-	rm -rf $(NAME_BIN)
+	rm -rf $(NAME)
 
-ALL_NAMES = $(NAME_CORE) # $(NAME_SAT) $(NAME_SMT) $(NAME_MCAT)
-TO_INSTALL_LIB=$(addsuffix .a, $(ALL_NAMES)) \
-	       $(addsuffix .cmi, $(ALL_NAMES))
+TO_INSTALL_LIB=$(addsuffix .a, $(NAME)) $(addsuffix .cmi, $(NAME))
 TO_INSTALL=META $(addprefix _build/src/,$(LIB) $(TO_INSTALL_LIB))
 
 install: lib
-	ocamlfind install $(NAME_OCAMLFIND) $(TO_INSTALL)
+	ocamlfind install $(NAME) $(TO_INSTALL)
+	mkdir -p $(DOCDIR)
+	cp -v $(NAME).docdir/*.html $(NAME).docdir/*.css $(DOCDIR)
 
 uninstall:
-	ocamlfind remove $(NAME_OCAMLFIND)
+	ocamlfind remove $(NAME)
 
-reinstall: all
-	ocamlfind remove $(NAME_OCAMLFIND) || true
-	ocamlfind install $(NAME_OCAMLFIND) $(TO_INSTALL)
+remove:
+	ocamlfind remove $(NAME) || true
 
-watch:
-	while find src/ -print0 | xargs -0 inotifywait -e delete_self -e modify ; do \
-		echo "============ at `date` ==========" ; \
-		sleep 0.1; \
-		make all; \
-	done
+reinstall: | remove install
 
-.PHONY: clean doc all bench install uninstall reinstall enable_log disable_log bin test
+.PHONY: clean doc all bench install uninstall remove reinstall enable_log disable_log bin test
diff --git a/opam b/opam
index 7c021147..f8e08cc9 100644
--- a/opam
+++ b/opam
@@ -8,11 +8,14 @@ build: [
     [make "disable_log"]
     [make "lib"]
 ]
+build-doc: [
+    [make "doc"]
+]
 install: [
-    [make "install"]
+    [make "DOCDIR=%{msat:doc}%" "install"]
 ]
 remove: [
-    ["ocamlfind" "remove" "msat"]
+    [make "uninstall"]
 ]
 depends: [
   "ocamlfind" {build}