This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch master
in repository yojson.
commit b490c9e4c6244774378849e878036bff8927163f
Author: Stephane Glondu <st...@glondu.net>
Date: Thu Sep 10 11:57:05 2015 +0200
Imported Upstream version 1.2.3
---
Makefile | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index dd43a46..d7472f4 100755
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION = 1.2.2
+VERSION = 1.2.3
ifeq "$(shell ocamlfind ocamlc -config |grep os_type)" "os_type: Win32"
EXE=.exe
@@ -7,7 +7,8 @@ EXE=
endif
-NATDYNLINK := $(shell if [ -f `ocamlfind ocamlc -where`/dynlink.cmxa ]; then
echo YES; else echo NO; fi)
+NATDYNLINK := $(shell if [ -f `ocamlfind ocamlc -where`/dynlink.cmxa ]; \
+ then echo YES; else echo NO; fi)
FLAGS = -dtypes -g
CMO = yojson.cmo yojson_biniou.cmo
@@ -17,7 +18,8 @@ CMXS = yojson.cmxs yojson_biniou.cmxs
endif
PACKS = easy-format,biniou
-.PHONY: default all opt install uninstall reinstall doc install-doc
+.PHONY: default all opt install uninstall install-lib uninstall-lib \
+ reinstall doc install-doc
default: META all opt
all: $(CMO)
opt: $(CMX) $(CMXS) ydump$(EXE)
@@ -35,18 +37,22 @@ endif
META: META.in Makefile
sed -e 's:@@VERSION@@:$(VERSION):' META.in > META
-install: META
+install: META install-lib
test ! -f ydump || cp ydump $(BINDIR)/
test ! -f ydump.exe || cp ydump.exe $(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)
-uninstall:
+uninstall: uninstall-lib
test ! -f $(BINDIR)/ydump || rm $(BINDIR)/ydump
test ! -f $(BINDIR)/ydump.exe || rm $(BINDIR)/ydump.exe
+
+uninstall-lib:
ocamlfind remove yojson
reinstall:
@@ -88,7 +94,8 @@ yojson_biniou.cmx: yojson_biniou.cmi yojson_biniou.ml
ocamlfind ocamlopt -c $(FLAGS) -package $(PACKS) yojson_biniou.ml
yojson_biniou.cmxs: yojson_biniou.cmx
- ocamlfind ocamlopt -shared -linkall -I . -o yojson_biniou.cmxs
yojson_biniou.cmx
+ ocamlfind ocamlopt -shared -linkall -I . -o yojson_biniou.cmxs \
+ yojson_biniou.cmx
ydump$(EXE): yojson.cmx yojson_biniou.cmx ydump.ml
ocamlfind ocamlopt -o ydump$(EXE) $(FLAGS) -package $(PACKS) -linkpkg \
--
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
