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

glondu pushed a commit to branch master
in repository yojson.

commit e492073b9f17c41d1f8c49711b950c3fb3568270
Author: Stephane Glondu <st...@glondu.net>
Date:   Wed Jun 1 11:44:40 2016 +0200

    Imported Upstream version 1.3.2
---
 .gitignore |  2 ++
 .merlin    |  3 +++
 Makefile   | 31 ++++++++++---------------------
 opam       | 23 +++++++++++++++++++++++
 4 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index 999cfd3..fe67807 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,8 @@
 *.o
 *.a
 *.annot
+*.cmt
+*.cmti
 META
 basic.mli
 out.html
diff --git a/.merlin b/.merlin
new file mode 100644
index 0000000..83e0dfc
--- /dev/null
+++ b/.merlin
@@ -0,0 +1,3 @@
+PKG easy-format biniou
+S .
+B .
diff --git a/Makefile b/Makefile
index 649739d..09321bc 100755
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,11 @@
-VERSION = 1.3.1
+include $(shell ocamlc -where)/Makefile.config
 
-ifeq "$(shell ocamlfind ocamlc -config |grep os_type)" "os_type: Win32"
-EXE=.exe
-else
-EXE=
-endif
-
-
-NATDYNLINK := $(shell if [ -f `ocamlfind ocamlc -where`/dynlink.cmxa ]; \
-                      then echo YES; else echo NO; fi)
+VERSION = 1.3.2
 
-FLAGS = -dtypes -g
+FLAGS = -bin-annot -dtypes -g
 CMO = yojson.cmo yojson_biniou.cmo
 CMX = yojson.cmx yojson_biniou.cmx
-ifeq "${NATDYNLINK}" "YES"
+ifeq ($(NATDYNLINK),true)
 CMXS = yojson.cmxs yojson_biniou.cmxs
 endif
 PACKS = easy-format,biniou
@@ -38,19 +30,16 @@ META: META.in Makefile
        sed -e 's:@@VERSION@@:$(VERSION):' META.in > META
 
 install: META install-lib
-       test ! -f ydump || cp ydump $(BINDIR)/
-       test ! -f ydump.exe || cp ydump.exe $(BINDIR)/
+       test ! -f ydump$(EXE) || cp ydump $(BINDIR)/
 
 install-lib:
        ocamlfind install yojson META \
-          $$(ls yojson.mli yojson_biniou.mli \
-               yojson.cmi yojson_biniou.cmi \
-               $(CMO) $(CMX) $(CMXS) \
-               yojson.o yojson_biniou.o)
+         $(wildcard *.cmt) $(wildcard *.cmti) $(wildcard *.mli) \
+         $(wildcard *.cmi) $(wildcard *$(EXT_LIB)) $(wildcard *.cmo) \
+         $(wildcard *$(EXT_OBJ)) $(wildcard *.cmx) $(wildcard *.cmxs)
 
 uninstall: uninstall-lib
-       test ! -f $(BINDIR)/ydump || rm $(BINDIR)/ydump
-       test ! -f $(BINDIR)/ydump.exe || rm $(BINDIR)/ydump.exe
+       test ! -f $(BINDIR)/ydump$(EXE) || rm $(BINDIR)/ydump$(EXE)
 
 uninstall-lib:
        ocamlfind remove yojson
@@ -117,7 +106,7 @@ bench: bench.ml yojson.cmx META
 .PHONY: clean
 
 clean:
-       rm -f *.o *.a *.cm* *~ *.annot ydump ydump.exe \
+       rm -f *.o *.a *.cm* *~ *.annot ydump$(EXE) \
                read.ml yojson.mli yojson.ml META
        rm -rf doc
        cd examples; $(MAKE) clean
diff --git a/opam b/opam
new file mode 100644
index 0000000..040484c
--- /dev/null
+++ b/opam
@@ -0,0 +1,23 @@
+opam-version: "1.2"
+maintainer: "mar...@mjambon.com"
+authors: ["Martin Jambon"]
+homepage: "http://mjambon.com/yojson.html";
+bug-reports: "https://github.com/mjambon/yojson/issues";
+dev-repo: "https://github.com/mjambon/yojson.git";
+available: [ ocaml-version >= "4.01.0"]
+build: [
+  [make] {ocaml-native}
+  [make "all"] {!ocaml-native}
+]
+install: [
+  [make "install-lib"]
+]
+remove: [
+  [make "uninstall-lib"]
+]
+depends: [
+  "ocamlfind" {build}
+  "cppo"
+  "easy-format"
+  "biniou" {>= "1.0.6"}
+]

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

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to