[Pkg-ocaml-maint-commits] [biniou] 01/07: Imported Upstream version 1.0.9

Stéphane Glondu glondu at moszumanska.debian.org
Fri Jan 31 10:15:20 UTC 2014


This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository biniou.

commit 23a52ee340b0731490c7bdc5d401c26b3728bc1f
Author: Stephane Glondu <steph at glondu.net>
Date:   Fri Jan 31 11:01:48 2014 +0100

    Imported Upstream version 1.0.9
---
 META.in  |  1 +
 Makefile | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/META.in b/META.in
index d596ae9..4a5788d 100644
--- a/META.in
+++ b/META.in
@@ -4,3 +4,4 @@ description = "Extensible binary serialization format"
 requires = "easy-format"
 archive(byte) = "biniou.cma"
 archive(native) = "biniou.cmxa"
+archive(native,plugin) = "biniou.cmxs"
diff --git a/Makefile b/Makefile
index 21d4253..824ed3b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.0.8
+VERSION = 1.0.9
 
 FLAGS = -dtypes -g
 PACKS = easy-format
@@ -9,10 +9,16 @@ else
 EXE=
 endif
 
+NATDYNLINK := $(shell if [ -f `ocamlc -where`/dynlink.cmxa ]; then echo YES; else echo NO; fi)
+
+ifeq "${NATDYNLINK}" "YES"
+CMXS=biniou.cmxs
+endif
+
 .PHONY: default all opt install doc test
 default: all opt test_biniou$(EXE) META
 all: biniou.cma
-opt: biniou.cmxa bdump$(EXE)
+opt: biniou.cmxa $(CMXS) bdump$(EXE)
 
 test: test_biniou$(EXE)
 	./test_biniou
@@ -51,6 +57,9 @@ biniou.cmxa: $(SOURCES) Makefile
 	ocamlfind ocamlopt -a $(FLAGS) \
 		-o biniou.cmxa -package "$(PACKS)" $(SOURCES)
 
+biniou.cmxs: biniou.cmxa
+	ocamlopt -shared -linkall -I . -o biniou.cmxs biniou.cmxa
+
 bdump$(EXE): $(SOURCES) bdump.ml
 	ocamlfind ocamlopt -o bdump$(EXE) $(FLAGS) \
 		-package $(PACKS) -linkpkg \
@@ -71,7 +80,7 @@ install: META
 	test ! -f bdump.exe || cp bdump.exe $(BINDIR)/
 	ocamlfind install biniou META \
           $$(ls $(MLI) $(CMI) $(CMO) $(CMX) $(O) \
-             biniou.cma biniou.cmxa biniou.a)
+             biniou.cma biniou.cmxa biniou.cmxs biniou.a)
 
 uninstall:
 	test ! -f $(BINDIR)/bdump || rm $(BINDIR)/bdump

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/biniou.git



More information about the Pkg-ocaml-maint-commits mailing list