From 6d706f55e5adec2ac5710465f7389de5381c2acf Mon Sep 17 00:00:00 2001
From: Guillaume Bury <guillaume.bury@gmail.com>
Date: Fri, 20 May 2016 16:21:06 +0200
Subject: [PATCH] Tags update + optimizations for ocaml 4.03

---
 Makefile | 12 +++++-------
 _tags    | 20 ++++++++++++--------
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index cd275265..26f2d5bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,8 @@
 # copyright (c) 2014, guillaume bury
 
 LOG=build.log
-COMP=ocamlbuild -log $(LOG) -use-ocamlfind -classic-display
-FLAGS=
-#-ocamlc ocamlopt -cflag -O3
-DIRS=-Is solver,sat,smt,backend,util,util/smtlib
+COMP=ocamlbuild -log $(LOG) -use-ocamlfind
+FLAGS=-cflags -color,always
 DOC=msat.docdir/index.html
 BIN=main.native
 NAME=msat
@@ -14,13 +12,13 @@ LIB=$(addprefix $(NAME), .cma .cmxa .cmxs)
 all: lib test
 
 lib:
-	$(COMP) $(FLAGS) $(DIRS) $(LIB)
+	$(COMP) $(FLAGS) $(LIB)
 
 doc:
-	$(COMP) $(FLAGS) $(DIRS) $(DOC)
+	$(COMP) $(FLAGS) $(DOC)
 
 bin:
-	$(COMP) $(FLAGS) $(DIRS) $(BIN)
+	$(COMP) $(FLAGS) $(BIN)
 	cp $(BIN) $(NAME) && rm $(BIN)
 
 test: bin
diff --git a/_tags b/_tags
index 2ea41d17..36a8cd38 100644
--- a/_tags
+++ b/_tags
@@ -1,17 +1,21 @@
+# optimization options
+true: optimize(3), unbox_closures
+
+# Include paths
+<sat>: include
+<smt>: include
+<solver>: include
+<backend>: include
+<util>: include
+<util/smtlib>: include
+
+# Pack options
 <util/*.cmx>: for-pack(Msat)
-#<util/*.native>: 
 <smt/*.cmx>: for-pack(Msat)
 <sat/*.cmx>: for-pack(Msat)
 <solver/*.cmx>: for-pack(Msat)
 <backend/*.cmx>: for-pack(Msat)
 
-# enable stronger inlining everywhere
-<util/{vec,hashcons,hstring,iheap}.cmx>: inline(100)
-<solver/*.cmx>: inline(50)
-<sat/**/*.cmx>: inline(100)
-<smt/**/*.cmx>: inline(100)
-<util/log.cmx>: inline(30)
-
 # more warnings
 <**/*.ml>: warn_K, warn_Y, warn_X
 <**/*.ml>: short_paths, safe_string, strict_sequence