Change findlib library names to rpclib (to not conflic with the alrea…

…dy existing ocamlnet's rpc library).

This should fix mirage#13

lib/META

@@ -1,6 +1,6 @@
-version = "1.1.0"
+version = "1.2.0"
 description = "RPC: lightweight library to convert plain ML types to and from RPC values"
-requires = "rpc.xml, rpc.json"
+requires = "rpclib.xml, rpclib.json"
 
 package "syntax" (
   description = "rpc: library to marshalling/unmarshalling ML types to/from RPC intermediate language"
@@ -24,27 +24,27 @@ package "core" (
 
 package "xml" (
   description = "XML-RPC marshalling/unmarshalling"
-  requires = "rpc.core,xmlm"
+  requires = "rpclib.core,xmlm"
   archive(byte) = "xmlrpc.cmo"
   archive(native) = "xmlrpc.cmx"
   )
 
 package "json" (
   description = "JSON-RPC marshalling/unmarshalling"
-  requires = "rpc.core"
+  requires = "rpclib.core"
   archive(byte) = "jsonrpc.cmo"
   archive(native) = "jsonrpc.cmx"
 )
 
 package "unix" (
   description = "Unix socket connection handling"
-  requires = "rpc.core"
+  requires = "rpclib.core"
   archive(byte) = "rpc_client.cmo"
   archive(native) = "rpc_client.cmx"
 )
 
 package "js" (
   description = "Javascript/browser connection handling"
-  requires = "rpc.core"
+  requires = "rpclib.core"
   archive(byte) = "rpc_client_js.cmo"
 )

lib/Makefile

@@ -53,15 +53,15 @@ rpc_client_js.cmo: rpc_client_js.ml
 .PHONY: install
 install: INSTALL_PATH = $(DESTDIR)$(shell ocamlfind printconf destdir)
 install: all
-	ocamlfind install -destdir $(INSTALL_PATH) rpc META $(TARGETS)
+	ocamlfind install -destdir $(INSTALL_PATH) rpclib META $(TARGETS)
 
 .PHONY: uninstall
 uninstall:
-	ocamlfind remove rpc
+	ocamlfind remove rpclib
 
 .PHONY: doc
 doc: $(INTF)
-	python ../doc/doc.py $(DOCDIR) "rpc" "package" "jsonrpc pa_rpc rpc xmlrpc" "." "xmlm" ""
+	python ../doc/doc.py $(DOCDIR) "rpclib" "package" "jsonrpc pa_rpc rpc xmlrpc" "." "xmlm" ""
 
 clean:
 	rm -f *.cmo *.cmx *.cma *.cmxa *.annot *.o *.cmi *.a

tests/Makefile

@@ -2,7 +2,7 @@ OCAMLC = ocamlfind ocamlc
 OCAMLOPT = ocamlfind ocamlopt
 OCAMLFLAGS = -annot -g
 
-PACKS = rpc,unix
+PACKS = rpclib,unix
 EXAMPLES = \
 	all_types \
 	phantom \
@@ -23,19 +23,19 @@ client.opt: idl_test.cmx idl_test.cmi client.cmx
 	$(OCAMLOPT) -linkpkg -package $(PACKS) -o $@ idl_test.cmx client.cmx
 
 idl_test.cmx: idl_test.ml idl_test.cmi
-	$(OCAMLOPT) -package $(PACKS),rpc.idl -syntax camlp4o -c -o $@ $<
+	$(OCAMLOPT) -package $(PACKS),rpclib.idl -syntax camlp4o -c -o $@ $<
 
 %.opt: %.cmx
 	$(OCAMLOPT) -linkpkg -package $(PACKS) -o $@ $<
 
 %.cmx: %.ml
-	$(OCAMLOPT) $(OCAMLFLAGS) -package $(PACKS),rpc.syntax -syntax camlp4o -c -o $@ $<
+	$(OCAMLOPT) $(OCAMLFLAGS) -package $(PACKS),rpclib.syntax -syntax camlp4o -c -o $@ $<
 
 %.cmi: %.mli
-	$(OCAMLOPT) $(OCAMLFLAGS) -package $(PACKS),rpc.syntax -syntax camlp4o -c -o $@ $<
+	$(OCAMLOPT) $(OCAMLFLAGS) -package $(PACKS),rpclib.syntax -syntax camlp4o -c -o $@ $<
 
 %_gen: %.ml
-	camlp4o $(shell ocamlfind query rpc.syntax -r -format "-I %d %a" -predicates syntax,preprocessor) $< -printer o > $@.ml
+	camlp4o $(shell ocamlfind query rpclib.syntax -r -format "-I %d %a" -predicates syntax,preprocessor) $< -printer o > $@.ml
 	$(OCAMLOPT) $(OCAMLFLAGS) -package $(PACKS) -c -o $@ $@.ml
 
 clean: