From db71f4847061c8532d6fb5a132fe538c680964b9 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Wed, 29 Oct 2014 14:18:00 +0100 Subject: [PATCH] modify build system --- META | 1 - Makefile | 17 +++++++++++++++-- _tags | 2 ++ smt/_tags | 1 - 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 _tags delete mode 100644 smt/_tags diff --git a/META b/META index 98ba83e9..fc9605d7 100644 --- a/META +++ b/META @@ -4,5 +4,4 @@ description="MSAT is a modular SAT solver, plus extensions" requires="num unix" archive(byte) = "msat.cma" archive(native) = "msat.cmxa" -archive(native) = "msat.cmxa" archive(native, plugin) = "msat.cmxs" diff --git a/Makefile b/Makefile index 284d3b26..75c52a2d 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,14 @@ # copyright (c) 2014, guillaume bury LOG=build.log -COMP=ocamlbuild -log $(LOG) -use-ocamlfind -package zarith,unix -classic-display +COMP=ocamlbuild -log $(LOG) -use-ocamlfind -package num,zarith,unix -classic-display FLAGS= DIRS=-Is smt,common DOC=lib.docdir/index.html -LIB=msat.cma msat.cmxa msat.cmxs + +NAME=msat + +LIB=$(addprefix $(NAME), .cma .cmxa .cmxs) GENERATED=$(MAIN) $(BIN) gmon.out all:$(LIB) @@ -19,3 +22,13 @@ doc: clean: $(COMP) -clean rm -f $(GENERATED) + +TO_INSTALL=META $(addprefix _build/,$(LIB)) + +install: all + ocamlfind install msat $(TO_INSTALL) + +uninstall: + ocamlfind remove msat + +.PHONY: clean doc all install uninstall diff --git a/_tags b/_tags new file mode 100644 index 00000000..c3d8dc13 --- /dev/null +++ b/_tags @@ -0,0 +1,2 @@ +: for-pack(Msat) + diff --git a/smt/_tags b/smt/_tags deleted file mode 100644 index 8f229e9e..00000000 --- a/smt/_tags +++ /dev/null @@ -1 +0,0 @@ -<*.ml*>: for-pack(Msat)